mergetools/codecompare


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

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE"
}
 
diff_cmd_help () {
	echo "Use Code Compare (requires a graphical session)"
}
 
merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \
			-RF="$MERGED"
	else
		"$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \
			-RF="$MERGED"
	fi
}
 
merge_cmd_help () {
	echo "Use Code Compare (requires a graphical session)"
}
 
translate_merge_tool_path() {
	if merge_mode
	then
		echo CodeMerge
	else
		echo CodeCompare
	fi
}