git

1
diff_cmd () {
2
	"$merge_tool_path" "$LOCAL" "$REMOTE"
3
}
4

5
diff_cmd_help () {
6
	echo "Use Beyond Compare (requires a graphical session)"
7
}
8

9
merge_cmd () {
10
	if $base_present
11
	then
12
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
13
			-mergeoutput="$MERGED"
14
	else
15
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
16
			-mergeoutput="$MERGED"
17
	fi
18
}
19

20
merge_cmd_help () {
21
	echo "Use Beyond Compare (requires a graphical session)"
22
}
23

24
translate_merge_tool_path() {
25
	if type bcomp >/dev/null 2>/dev/null
26
	then
27
		echo bcomp
28
	else
29
		echo bcompare
30
	fi
31
}
32

33
list_tool_variants () {
34
	echo bc
35
	echo bc3
36
	echo bc4
37
}
38