Kasim kasimte
kasimte
/ .gitconfig-for-diffmerge
Created
October 29, 2020 05:18
— forked from YanhaoYang/.gitconfig-for-diffmerge
Using DiffMerge as your Git visual merge and diff tool on Mac
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 | |
| [difftool "diffmerge"] | |
| cmd = diffmerge \"$LOCAL\" \"$REMOTE\" | |
| [merge] | |
| tool = diffmerge | |
| [mergetool "diffmerge"] | |
| cmd = "diffmerge --merge --result=\"$MERGED\" \"$LOCAL\" \"$(if test -f \"$BASE\"; then echo \"$BASE\"; else echo \"$LOCAL\"; fi)\" \"$REMOTE\"" | |
| trustExitCode = true |