From: Tim Henigan <tim.henigan@gmail.com>
Date: Fri, 02 Mar 2012 01:47:52 GMT
Subject: [PATCH] mergetools: add support for DeltaWalker
Message-ID: <1330652872-916-1-git-send-email-tim.henigan@gmail.com>

Since bc7a96a8965d, integration with external diff/merge tools requires
a mergetools/$tool file to be present.

This commits adds support for DeltaWalker.

Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
---

Tested with DeltaWalker v1.9.8 on Ubuntu 11.10 and msysgit on Win7.


 mergetools/DeltaWalker |   13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 mergetools/DeltaWalker

diff --git a/mergetools/DeltaWalker b/mergetools/DeltaWalker
new file mode 100644
index 0000000..ae66686
--- /dev/null
+++ b/mergetools/DeltaWalker
@@ -0,0 +1,13 @@
+diff_cmd () {
+       "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
+}
+
+merge_cmd () {
+       if $base_present
+       then
+               "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$PWD/$MERGED" >/dev/null 2>&1
+       else
+               "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$PWD/$MERGED" >/dev/null 2>&1
+       fi
+       status=$?
+}
-- 
1.7.9.GIT