summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-06 22:53:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-03-06 22:53:07 (GMT)
commitf4464a3b7c9319011acf7b813b0217e244f4954e (patch)
tree8be249b9189b9b6b6a2d687e1babce08832b1c6b
parent4b4ec3fc6480312515e1ec3d827c1308c00adc1e (diff)
parent284a126c3ef3dfedede9bc64df4cf3a24600dea5 (diff)
downloadgit-f4464a3b7c9319011acf7b813b0217e244f4954e.zip
git-f4464a3b7c9319011acf7b813b0217e244f4954e.tar.gz
git-f4464a3b7c9319011acf7b813b0217e244f4954e.tar.bz2
Merge branch 'th/mergetools-deltawalker'
By Tim Henigan * th/mergetools-deltawalker: mergetools: add a plug-in to support DeltaWalker
-rw-r--r--mergetools/deltawalker21
1 files changed, 21 insertions, 0 deletions
diff --git a/mergetools/deltawalker b/mergetools/deltawalker
new file mode 100644
index 0000000..b3c71b6
--- /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
+}