From: Tim Henigan Date: Fri, 02 Mar 2012 13:27:47 GMT Subject: [PATCH v2] mergetools: add support for DeltaWalker Message-ID: <1330694867-7601-1-git-send-email-tim.henigan@gmail.com> Thanks to bc7a96a8965d, it is possible to integrate new external diff/merge tools by adding a simple shell script at mergetools/$tool. This commit adds DeltaWalker support. Signed-off-by: Tim Henigan --- Changes in v2: - reworded the commit message - moved >/dev/null redirect to after the final fi statement - removed the 'status=$?' line at the end of merge_cmd() Tested with DeltaWalker v1.9.8 on Ubuntu 11.10 and msysgit on Win7. mergetools/DeltaWalker | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 mergetools/DeltaWalker diff --git a/mergetools/DeltaWalker b/mergetools/DeltaWalker new file mode 100644 index 0000000..b9e6618 --- /dev/null +++ b/mergetools/DeltaWalker @@ -0,0 +1,12 @@ +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" + else + "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$PWD/$MERGED" + fi >/dev/null 2>&1 +} -- 1.7.9.2.315.g25a78