Skip to content

Instantly share code, notes, and snippets.

@billpieper
Forked from dahlbyk/.gitconfig
Created April 25, 2016 14:52
Show Gist options
  • Save billpieper/a06013e5abcc6faec5fb969ccf712d03 to your computer and use it in GitHub Desktop.
Save billpieper/a06013e5abcc6faec5fb969ccf712d03 to your computer and use it in GitHub Desktop.
Windows Git Diff/Merge Tool Configuration
[alias]
dt = difftool
mt = mergetool
[diff]
tool = bc3
[difftool]
prompt = false
[difftool "bc3"]
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\"
[difftool "p4"]
cmd = \"c:/program files/Perforce/p4merge.exe\" \"$LOCAL\" \"$REMOTE\"
[merge]
tool = bc3
[mergetool]
prompt = false
keepBackup = false
[mergetool "bc3"]
cmd = \"c:/program files (x86)/beyond compare 3/bcomp.exe\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\"
trustExitCode = true
[mergetool "p4"]
cmd = \"c:/program files/Perforce/p4merge.exe\" \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment