git

1
diff_cmd () {
2
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
3
}
4

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

9
merge_cmd () {
10
	# Adding $(pwd)/ in front of $MERGED should not be necessary.
11
	# However without it, DeltaWalker (at least v1.9.8 on Windows)
12
	# crashes with a JRE exception.  The DeltaWalker user manual,
13
	# shows $(pwd)/ whenever the '-merged' options is given.
14
	# Adding it here seems to work around the problem.
15
	if $base_present
16
	then
17
		"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" -merged="$(pwd)/$MERGED"
18
	else
19
		"$merge_tool_path" "$LOCAL" "$REMOTE" -merged="$(pwd)/$MERGED"
20
	fi >/dev/null 2>&1
21
}
22

23
merge_cmd_help () {
24
	echo "Use DeltaWalker (requires a graphical session)"
25
}
26

27
translate_merge_tool_path () {
28
	echo DeltaWalker
29
}
30

31
exit_code_trustable () {
32
	true
33
}
34