mergetools / guiffyon commit Merge branch 'mm/p4-unshelve-windows-fix' into maint (0eb2774)
   1diff_cmd () {
   2        "$merge_tool_path" "$LOCAL" "$REMOTE"
   3}
   4
   5merge_cmd () {
   6        if $base_present
   7        then
   8                "$merge_tool_path" -s "$LOCAL" \
   9                "$REMOTE" "$BASE" "$MERGED"
  10        else
  11                "$merge_tool_path" -m "$LOCAL" \
  12                "$REMOTE" "$MERGED"
  13        fi
  14}
  15
  16exit_code_trustable () {
  17        true
  18}