git

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

5
diff_cmd_help () {
6
	echo "Use Guiffy's Diff Tool (requires a graphical session)"
7
}
8

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

20
merge_cmd_help () {
21
	echo "Use Guiffy's Diff Tool (requires a graphical session)"
22
}
23

24
exit_code_trustable () {
25
	true
26
}
27