SHARE
TWEET

Untitled

a guest Jan 17th, 2019 63 Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. [merge]
  2.         tool = p4merge
  3. [mergetool "p4merge"]
  4.         cmd = p4merge.exe -nb Base -nl Theirs -nr Yours -nm Merged \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
RAW Paste Data
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy. OK, I Understand
 
Top