Last active
January 11, 2018 00:07
-
-
Save vitorhsb/357b7ba83db8302244f97e5c3f4feef4 to your computer and use it in GitHub Desktop.
Setup DiffMerge as Git merge and diff tool (Mac OS) - Resulting config
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
| [diff] | |
| tool = diffmerge | |
| [merge] | |
| tool = diffmerge | |
| ... | |
| [mergetool "diffmerge"] | |
| cmd = /usr/local/bin/diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" | |
| trustExitCode = true | |
| [mergetool] | |
| keepBackup = false | |
| [difftool "diffmerge"] | |
| cmd = /usr/local/bin/diffmerge --nosplash \"$LOCAL\" \"$REMOTE\" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment