Skip to content

Instantly share code, notes, and snippets.

@Speedy37

Speedy37/TortoiseSVN+P4Merge.md

Created September 8, 2022 10:17
Show Gist options
  • Save Speedy37/09422a7d2bfa9d793af3d01b0bfaf1fa to your computer and use it in GitHub Desktop.
Save Speedy37/09422a7d2bfa9d793af3d01b0bfaf1fa to your computer and use it in GitHub Desktop.
Download ZIP
TortoiseSVN+P4Merge.md
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