Last active
November 2, 2021 15:12
-
-
Save vitorhsb/9744d9aba0ecd8500a145709fd13103b to your computer and use it in GitHub Desktop.
Setup DiffMerge as Git merge and diff tool (Mac OS)
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
| git config --global merge.tool diffmerge | |
| git config --global mergetool.diffmerge.cmd "/usr/local/bin/diffmerge --merge --result=\"\$MERGED\" \"\$LOCAL\" \"\$BASE\" \"\$REMOTE\"" | |
| git config --global mergetool.diffmerge.trustExitCode true | |
| git config --global mergetool.keepBackup false | |
| git config --global diff.tool diffmerge | |
| git config --global difftool.diffmerge.cmd "/usr/local/bin/diffmerge --nosplash \"\$LOCAL\" \"\$REMOTE\"" |
your line is 2nd at least is bad
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
bad config line 5 in file /Users/el314/.gitconfig