David Aguilar <davvid@xxxxxxxxx> writes:
> Can you mention this in a comment so that someone doesn't copy/paste
> it into another tool in the future?
Ok, I think the result should look like this, but could you fill in the
details in the below?
-- >8 --
From: Tim Henigan <tim.henigan@xxxxxxxxx>
Date: Sat, 3 Mar 2012 11:56:34 -0500
Subject: [PATCH] mergetools: add a plug-in to support DeltaWalker
DeltaWalker is a non-free tool that is popular among xxxxxxx users. Add a
plug-in to support it from difftool and mergetool.
Note that $(pwd)/ in front of $MERGED shouldn't be necessary, but without
it, DeltaWalker crashes with an JRE exception.
Signed-off-by: Tim Henigan <tim.henigan@xxxxxxxxx>
Helped-by: David Aguilar
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
mergetools/deltawalker | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 mergetools/deltawalker
diff --git a/mergetools/deltawalker b/mergetools/deltawalker
new file mode 100644
index 0000000..f8631f2
--- /dev/null
+++ b/mergetools/deltawalker
@@ -0,0 +1,19 @@
+diff_cmd () {
+ "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
+}
+
+merge_cmd () {
+ # The $(pwd)/ in front of $MERGED should not be necessary but
+ # DeltaWalker (at least ver XXX) crashes with a JRE exception
+ # and the $(pwd)/ seems to work around it.
+ 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
+}
--
1.7.9.2.390.g8f827
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html