Skip to content

Instantly share code, notes, and snippets.

@hibri

hibri/gist:2300074

Created April 4, 2012 10:01
Show Gist options
  • Save hibri/2300074 to your computer and use it in GitHub Desktop.
Save hibri/2300074 to your computer and use it in GitHub Desktop.
Download ZIP
SourceGear Diffmerge 3 way merge params for TortiseGit
Raw
gistfile1.txt
--merge --result=%merged %mine %base %theirs --title1="Mine : %yname" --title2="Merged: %mname" --title3="Theirs : %tname"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment