summaryrefslogtreecommitdiff
path: root/mergetools/tkdiff
blob: 618c438e8765a485ffcc70a105fb0cf46010540c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -a "$BASE" -o "$MERGED" "$LOCAL" "$REMOTE"
	else
		"$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE"
	fi
}