Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

use p4merge as external merge tool

  • Loading branch information...
commit 5ce4164facd6884d84f955ed9f9b08d76cfb8d3b 1 parent 210154a
@nouh authored
Showing with 9 additions and 6 deletions.
  1. +2 −0  bin/extDiff
  2. +2 −0  bin/extMerge
  3. +5 −6 gitconfig
View
2  bin/extDiff
@@ -0,0 +1,2 @@
+#!/bin/sh
+[ $# -eq 7 ] && extMerge "$2" "$5"
View
2  bin/extMerge
@@ -0,0 +1,2 @@
+#! /bin/sh
+/Applications/p4merge.app/Contents/MacOS/p4merge $*
View
11 gitconfig
@@ -24,14 +24,13 @@
[user]
name = Zach Zhao
email = zach.bstek@gmail.com
+#[diff]
+# external = extDiff
[merge]
- keepBackup = false;
- tool = p4merge
-[mergetool "p4merge"]
- cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
- keepTemporaries = false
+ tool = extMerge
+[mergetool "extMerge"]
+ cmd = extMerge \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"
trustExitCode = false
- keepBackup = false
[alias]
# add
a = add # add

0 comments on commit 5ce4164

Please sign in to comment.
Something went wrong with that request. Please try again.