Skip to main content

Browse the archive

Staging
v0.5.2
Revision e15c16de396a1e1f42001b03cb885ce64eb4098e authored by Junio C Hamano on 07 August 2012, 17:39:34 UTC, committed by Junio C Hamano on 07 August 2012, 17:39:34 UTC 
Git 1.7.12-rc2
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b1d9b1d
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