mergetools / p4mergeon commit Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb5230361c64946232cc346' (634392b)
   1diff_cmd () {
   2        "$merge_tool_path" "$LOCAL" "$REMOTE"
   3}
   4
   5merge_cmd () {
   6        touch "$BACKUP"
   7        $base_present || >"$BASE"
   8        "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
   9        check_unchanged
  10}