blob: ee6f374bceb8e14af5b424e64fbe9787006091e8 [file] [log] [blame]
Tim Henigan284a1262012-03-05 09:28:07 -05001diff_cmd () {
2 "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
3}
4
5merge_cmd () {
6 # Adding $(pwd)/ in front of $MERGED should not be necessary.
7 # However without it, DeltaWalker (at least v1.9.8 on Windows)
8 # crashes with a JRE exception. The DeltaWalker user manual,
9 # shows $(pwd)/ whenever the '-merged' options is given.
10 # Adding it here seems to work around the problem.
11 if $base_present
12 then
13 "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
14 else
15 "$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
16 fi >/dev/null 2>&1
17}
18
David Aguilar7c106052016-11-29 01:38:07 -080019translate_merge_tool_path () {
Tim Henigan284a1262012-03-05 09:28:07 -050020 echo DeltaWalker
21}
David Aguilar7c106052016-11-29 01:38:07 -080022
23exit_code_trustable () {
24 true
25}