Skip to content

Instantly share code, notes, and snippets.

@willis7

willis7/WinMerge_TortoiseGit.md

Created May 21, 2014 20:16
Show Gist options
  • Save willis7/ce22475f108d3dfecdbf to your computer and use it in GitHub Desktop.
Save willis7/ce22475f108d3dfecdbf to your computer and use it in GitHub Desktop.
Download ZIP
Raw
WinMerge_TortoiseGit.md

Open TortoiseGit > Settings, and click on Diff Viewer.

Under the Configure the program used for comparing different revisions of files section, select External, and add the following into the text box.

WinMergeU.exe /r /e /x /u /wl %base %mine

Click on Merge Tool to the left, select External, enter the following.

WinMergeU.exe /e /u %merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment