1diff_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 19translate_merge_tool_path() { 20 echo DeltaWalker 21}