[thirdparty/git.git] / mergetools / xxdiff

diff_cmd () {
	"$merge_tool_path" \
		-R 'Accel.Search: "Ctrl+F"' \
		-R 'Accel.SearchForward: "Ctrl-G"' \
		"$LOCAL" "$REMOTE"
}

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" -X --show-merged-pane \
			-R 'Accel.SaveAsMerged: "Ctrl-S"' \
			-R 'Accel.Search: "Ctrl+F"' \
			-R 'Accel.SearchForward: "Ctrl-G"' \
			--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" -X $extra \
			-R 'Accel.SaveAsMerged: "Ctrl-S"' \
			-R 'Accel.Search: "Ctrl+F"' \
			-R 'Accel.SearchForward: "Ctrl-G"' \
			--merged-file "$MERGED" "$LOCAL" "$REMOTE"
	fi
	check_unchanged
}
Commit	Line	Data
bc7a96a8 DA	1	diff_cmd () {
	2	"$merge_tool_path" \
	3	-R 'Accel.Search: "Ctrl+F"' \
	4	-R 'Accel.SearchForward: "Ctrl-G"' \
	5	"$LOCAL" "$REMOTE"
	6	}
	7
	8	merge_cmd () {
	9	touch "$BACKUP"
	10	if $base_present
	11	then
	12	"$merge_tool_path" -X --show-merged-pane \
	13	-R 'Accel.SaveAsMerged: "Ctrl-S"' \
	14	-R 'Accel.Search: "Ctrl+F"' \
	15	-R 'Accel.SearchForward: "Ctrl-G"' \
	16	--merged-file "$MERGED" "$LOCAL" "$BASE" "$REMOTE"
	17	else
	18	"$merge_tool_path" -X $extra \
	19	-R 'Accel.SaveAsMerged: "Ctrl-S"' \
	20	-R 'Accel.Search: "Ctrl+F"' \
	21	-R 'Accel.SearchForward: "Ctrl-G"' \
	22	--merged-file "$MERGED" "$LOCAL" "$REMOTE"
	23	fi
	24	check_unchanged
	25	}