tmont/settings
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed diffmerge path

Browse Source
This commit is contained in:
tmont 2018-12-04 14:01:07 -08:00
parent cb530888ee
commit c873b524c9
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitconfig-mac
View File

@ -20,4 +20,4 @@
tool = diffmerge tool = diffmerge
[mergetool "diffmerge"] [mergetool "diffmerge"]
trustExitCode = true trustExitCode = true
cmd = /usr/local/bin/diffmerge --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE" cmd = /Applications/DiffMerge.app/Contents/Resources/diffmerge.sh --merge --result="$MERGED" "$LOCAL" "$BASE" "$REMOTE"