mergetools/bc


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}
 
diff_cmd_help () {
	echo "Use Beyond Compare (requires a graphical session)"
}
 
merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
			-mergeoutput="$MERGED"
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-mergeoutput="$MERGED"
	fi
}
 
merge_cmd_help () {
	echo "Use Beyond Compare (requires a graphical session)"
}
 
translate_merge_tool_path() {
	if type bcomp >/dev/null 2>/dev/null
	then
		echo bcomp
	else
		echo bcompare
	fi
}
 
list_tool_variants () {
	echo bc
	echo bc3
	echo bc4
}