mergetools/tkdiff


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16

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
}
 
exit_code_trustable () {
	true
}