updated mergetool config

2014-09-25 14:50:12 -05:00 · 2014-09-25 14:50:12 -05:00 · eaff71bc70
parent 86fd39bfa2
commit eaff71bc70
1 changed files with 4 additions and 1 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -49,7 +49,10 @@
 	tool = p4merge

 [mergetool "p4merge"]
-	cmd = p4merge.exe -db -nb Base -nl Mine-local -nr Theirs-remote $BASE $LOCAL $REMOTE $MERGED
+	cmd = p4merge.exe $BASE $LOCAL $REMOTE $MERGED
+  keepTemporaries = false
+  trustExitCode = false
+  keepBackup = false

 [mergetool]
 	prompt = false