diff options
Diffstat (limited to 'third_party/git/mergetools/deltawalker')
| -rw-r--r-- | third_party/git/mergetools/deltawalker | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/third_party/git/mergetools/deltawalker b/third_party/git/mergetools/deltawalker new file mode 100644 index 000000000000..ee6f374bceb8 --- /dev/null +++ b/third_party/git/mergetools/deltawalker @@ -0,0 +1,25 @@ +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 +} + +exit_code_trustable () { + true +} |