Created
January 11, 2018 00:23
-
-
Save vitorhsb/9b06a163ef6ba64429f6882dda31373b to your computer and use it in GitHub Desktop.
Set DiffMerge as Git merge and diff tool (Linux)
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/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/bin/diffmerge --nosplash \"\$LOCAL\" \"\$REMOTE\"" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment