mergetools/defaults


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

# Redefined by builtin tools
can_merge () {
	return 0
}
 
can_diff () {
	return 0
}
 
diff_cmd () {
	status=1
	return $status
}
 
merge_cmd () {
	status=1
	return $status
}
 
translate_merge_tool_path () {
	echo "$1"
}