Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8
[git] / mergetools / p4merge
1 diff_cmd () {
2         "$merge_tool_path" "$LOCAL" "$REMOTE"
3 }
4
5 merge_cmd () {
6         touch "$BACKUP"
7         $base_present || >"$BASE"
8         "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
9         check_unchanged
10 }