Andrew's git / gitweb.git / mergetools/p4merge
?
mergetools / p4mergeon commit Further merging in preparation for 1.7.12.1 (e70d163)
   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}