Skip to content

Instantly share code, notes, and snippets.

@ellisda
Created November 18, 2015 20:03
Show Gist options
  • Save ellisda/25cdd92129c5b44406ab to your computer and use it in GitHub Desktop.
Save ellisda/25cdd92129c5b44406ab to your computer and use it in GitHub Desktop.
global .gitconfig to use TortoiseGit for visual diff via `git difftool`
[diff]
tool = TortoiseGitMerge
[difftool]
prompt = false
[difftool "TortoiseGitMerge"]
cmd = \"C:\\Program Files\\TortoiseGit\\bin\\TortoiseGitMerge.exe\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
[merge]
tool = TortoiseGitMerge
[mergetool "TortoiseGitMerge"]
cmd = \"C:\\Program Files\\TortoiseGit\\bin\\TortoiseGitMerge.exe\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
@creationsx
Copy link

+1

@lynxnake
Copy link

Thanks

@deadlydog
Copy link

deadlydog commented Oct 30, 2018

👍

TortoiseGitMerge complained with that difftool cmd though:

Can't open file '$BASE': The system cannot find the file specified.

I used this instead and it worked:

cmd = \"C:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe\" -mine:\"$REMOTE\" -base:\"$LOCAL\"

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment