Skip to content

Instantly share code, notes, and snippets.

@AndreKR

AndreKR/tgit_dmerge.txt

Last active March 29, 2019 08:17
Show Gist options
  • Save AndreKR/fbb286b2ced3a91b4cfa7be6278f59c6 to your computer and use it in GitHub Desktop.
Save AndreKR/fbb286b2ced3a91b4cfa7be6278f59c6 to your computer and use it in GitHub Desktop.
Download ZIP
TortoiseGit + DiffMerge
Raw
tgit_dmerge.txt
"C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe" -m -t1=%yname -t2=%bname -t3=%tname -result=%merged %mine %base %theirs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment