Created
December 19, 2011 01:04
-
-
Save bjhess/1494995 to your computer and use it in GitHub Desktop.
git diff'n
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# side by side diff | |
alias gside="git difftool -t opendiff" | |
# resolve merge conflicts with filemerge | |
alias gmergetool="git mergetool -t opendiff" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment