mergetools/p4merge


1
2
3
4
5
6
7
8
9
10

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	touch "$BACKUP"
	$base_present || >"$BASE"
	"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
	check_unchanged
}