From 284a126c3ef3dfedede9bc64df4cf3a24600dea5 Mon Sep 17 00:00:00 2001 From: Tim Henigan Date: Mon, 5 Mar 2012 09:28:07 -0500 Subject: [PATCH] mergetools: add a plug-in to support DeltaWalker DeltaWalker is a non-free tool popular among some users. Add a plug-in to support it from difftool and mergetool. Note that the $(pwd)/ in front of $MERGED should not be necessary. However without it, DeltaWalker crashes with a JRE exception. Signed-off-by: Tim Henigan Helped-by: David Aguilar Signed-off-by: Junio C Hamano --- mergetools/deltawalker | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 mergetools/deltawalker diff --git a/mergetools/deltawalker b/mergetools/deltawalker new file mode 100644 index 000000000..b3c71b623 --- /dev/null +++ b/mergetools/deltawalker @@ -0,0 +1,21 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 +} + +merge_cmd () { + # Adding $(pwd)/ in front of $MERGED should not be necessary. + # However without it, DeltaWalker (at least v1.9.8 on Windows) + # crashes with a JRE exception. The DeltaWalker user manual, + # shows $(pwd)/ whenever the '-merged' options is given. + # Adding it here seems to work around the problem. + 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 +} + +translate_merge_tool_path() { + echo DeltaWalker +} -- 2.26.2