git config --global merge.tool p4merge
git config --global mergetool.p4merge.cmd "p4merge $BASE $LOCAL $REMOTE $MERGED"
git config --global mergetool.p4merge.keeptemporaries false
git config --global mergetool.p4merge.trustExitCode false
git config --global mergetool.p4merge.keepbackup false
16 Dec 2013
Configure P4Merge for Git on Windows 7
Subscribe to:
Post Comments (Atom)
No comments:
Post a Comment