Skip to main content

Browse the archive

Revision b1d9b1d0f1880c753d5146e8af63b9dc72803e4a authored by Junio C Hamano on 06 August 2012, 22:58:38 UTC, committed by Junio C Hamano on 06 August 2012, 22:58:38 UTC 
Drop 1.7.11.x items from 1.7.12 release notes
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 9ffdd46
Raw File
opendiff 
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

merge_cmd () {
	touch "$BACKUP"
	if $base_present
	then
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-ancestor "$BASE" -merge "$MERGED" | cat
	else
		"$merge_tool_path" "$LOCAL" "$REMOTE" \
			-merge "$MERGED" | cat
	fi
	check_unchanged
}
back to top