summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
blob: 0942b2a733592d3f0a5a39b4fc1defd635eb7b04 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-ancestor "$BASE" -merge "$MERGED" | cat
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-merge "$MERGED" | cat
	fi
	check_unchanged
}