https://github.com/git/git
Raw File
Tip revision: 8d19b44b316411d6e3a90db257a4901580603884 authored by Junio C Hamano on 01 November 2011, 23:16:36 UTC
Git 1.7.7.2
Tip revision: 8d19b44
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