Git patch to add DeltaWalker support

0001-mergetools-add-support-for-DeltaWalker-dw.patch

From 8d1944e1c408030bab2ebb90b8c24fb4294c7fea Mon Sep 17 00:00:00 2001
From: Tim Henigan <[email protected]>
Date: Thu, 1 Mar 2012 14:19:32 -0500
Subject: [PATCH] mergetools: add support for DeltaWalker

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

This commits adds DeltaWalker support.

Signed-off-by: Tim Henigan <[email protected]>
---
 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..8d2beb5
--- /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.2.315.g25a78