2013-09-16 10:39:41 +01:00
|
|
|
|
|
|
|
|
[mergetool "filemerge"]
|
|
|
|
|
cmd = /Applications/Xcode.app/Contents/Applications/FileMerge.app/Contents/MacOS/FileMerge -merge $MERGED -left $LOCAL -ancestor $BASE -right $REMOTE
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[core]
|
|
|
|
|
excludesfile = /Users/cplotnicki/.gitignore_global
|
|
|
|
|
[difftool "kdiff3"]
|
|
|
|
|
path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
[difftool]
|
|
|
|
|
prompt = false
|
|
|
|
|
[diff]
|
|
|
|
|
tool = kdiff3
|
|
|
|
|
[mergetool "kdiff3"]
|
|
|
|
|
path = /Applications/kdiff3.app/Contents/MacOS/kdiff3
|
|
|
|
|
trustExitCode = false
|
|
|
|
|
keepBackup = false
|
|
|
|
|
[merge]
|
|
|
|
|
tool = kdiff3
|
|
|
|
|
[difftool "sourcetree"]
|
|
|
|
|
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
|
|
|
|
path =
|
|
|
|
|
[mergetool "sourcetree"]
|
|
|
|
|
cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
|
|
|
|
|
trustExitCode = true
|
2013-10-09 11:21:14 +01:00
|
|
|
|
