Skip to content

Instantly share code, notes, and snippets.

@ashmind

ashmind/TortoiseSVN+P4Merge.md

Last active November 19, 2020 11:19
Show Gist options
  • Star 6 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ashmind/a7f49c58f1e61c242b10 to your computer and use it in GitHub Desktop.
Save ashmind/a7f49c58f1e61c242b10 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
TortoiseSVN+P4Merge.md 
Diff:
C:\Program Files\Perforce\p4merge.exe -nl %bname -nr %yname %base %mine

Merge:
C:\Program Files\Perforce\p4merge.exe -nb %bname -nl %tname -nr %yname -nm %mname %base %theirs %mine %merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment