Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
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