API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Aug 27th, 2014
140
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.25 KB | None | 0 0
raw download clone embed print report
  1. [mergetool "p4merge"]
  2. cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
  3.  
  4. git config --global mergetool.p4merge.cmd "p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
  5.  
  6. [mergetool "p4merge"]
  7. cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
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
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!