Skip to content

Instantly share code, notes, and snippets.

@pavelburov

pavelburov/.gitconfig

Last active April 30, 2019 10:06
Show Gist options
  • Save pavelburov/5305d0eff8fe09aca18312e2a26f8bc8 to your computer and use it in GitHub Desktop.
Save pavelburov/5305d0eff8fe09aca18312e2a26f8bc8 to your computer and use it in GitHub Desktop.
Download ZIP
Configuring DiffMerge as mergetool for git
Raw
.gitconfig
[merge]
tool = diffMerge
[mergetool "diffMerge"]
cmd = DiffMerge.exe -caption=$MERGED -merge -result=$MERGED -t1='Local' -t2='Base' -t3='Remote' $LOCAL $BASE $REMOTE
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment