diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:07 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-03-06 14:53:07 -0800 |
| commit | f4464a3b7c9319011acf7b813b0217e244f4954e (patch) | |
| tree | 8be249b9189b9b6b6a2d687e1babce08832b1c6b | |
| parent | Merge branch 'cn/pull-rebase-message' (diff) | |
| parent | mergetools: add a plug-in to support DeltaWalker (diff) | |
| download | tgif-f4464a3b7c9319011acf7b813b0217e244f4954e.tar.xz | |
Merge branch 'th/mergetools-deltawalker'
By Tim Henigan
* th/mergetools-deltawalker:
mergetools: add a plug-in to support DeltaWalker
| -rw-r--r-- | mergetools/deltawalker | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/mergetools/deltawalker b/mergetools/deltawalker new file mode 100644 index 0000000000..b3c71b6236 --- /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 +} |