Skip to content

Instantly share code, notes, and snippets.

@ericdagenais

ericdagenais/Tortoise-Diff-Merge-Settings.md

Created May 24, 2012 18:52
Show Gist options
  • Save ericdagenais/2783475 to your computer and use it in GitHub Desktop.
Save ericdagenais/2783475 to your computer and use it in GitHub Desktop.
Download ZIP
Tortoise Diff/Merge Settings
Raw
Tortoise-Diff-Merge-Settings.md

Perforce

  • Merge

"C:\Program Files\Perforce\P4Merge.exe" %base %theirs %mine %merged

DiffMerge

  • Diff

"C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe" /t1=Mine /t2=Original %mine %base

  • Merge

"C:\Program Files\SourceGear\Common\DiffMerge\sgdm.exe" /t1=Mine /t2=Base /t3=Theirs /r=%merged %mine %base %theirs

Beyond Compare 3

  • Diff

"C:\Program Files (x86)\Beyond Compare 3\BComp.exe" %base %mine /title1=%bname /title2=%yname /leftreadonly

  • Merge (v3 Pro)

"C:\Program Files (x86)\Beyond Compare 3\BComp.exe" %mine %theirs %base %merged /title1=%yname /title2=%tname /title3=%bname /title4=%mname

  • Merge (v3 Std)

"C:\Program Files (x86)\Beyond Compare 3\BComp.exe" %mine %theirs /mergeoutput=%merged

WinMerge

  • Diff

"C:\Program Files (x86)\WinMerge\WinMergeU.exe" -e -x -ub -dl %bname -dr %yname %base %mine

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