git

1
diff_cmd () {
2
	"$merge_tool_path" \
3
		-R 'Accel.Search: "Ctrl+F"' \
4
		-R 'Accel.SearchForward: "Ctrl+G"' \
5
		"$LOCAL" "$REMOTE"
6

7
	# xxdiff can segfault on binary files which are often uninteresting.
8
	# Do not allow segfaults to stop us from continuing on to the next file.
9
	if test $? = 128
10
	then
11
		return 1
12
	fi
13
}
14

15
diff_cmd_help () {
16
	echo "Use xxdiff (requires a graphical session)"
17
}
18

19
merge_cmd () {
20
	if $base_present
21
	then
22
		"$merge_tool_path" -X --show-merged-pane \
23
			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
24
			-R 'Accel.Search: "Ctrl+F"' \
25
			-R 'Accel.SearchForward: "Ctrl+G"' \
26
			--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
27
	else
28
		"$merge_tool_path" -X $extra \
29
			-R 'Accel.SaveAsMerged: "Ctrl+S"' \
30
			-R 'Accel.Search: "Ctrl+F"' \
31
			-R 'Accel.SearchForward: "Ctrl+G"' \
32
			--merged-file "$MERGED" "$LOCAL" "$REMOTE"
33
	fi
34
}
35

36
merge_cmd_help () {
37
	echo "Use xxdiff (requires a graphical session)"
38
}
39