Skip to main content

Browse the archive

Revision 773e25afc41b1b6533fa9ae2cd825d0b4a697fad authored by Junio C Hamano on 08 February 2021, 22:05:35 UTC, committed by Junio C Hamano on 08 February 2021, 22:05:55 UTC 
Git 2.30.1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent dadf9e5
Raw File
xxdiff 
diff_cmd () {
	"$merge_tool_path" \
		-R 'Accel.Search: "Ctrl+F"' \
		-R 'Accel.SearchForward: "Ctrl+G"' \
		"$LOCAL" "$REMOTE"
}

merge_cmd () {
	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
}
back to top