https://github.com/git/git
Raw File
Tip revision: 5bda18c186e455f8e65f976d3bf333ab1f4b5b53 authored by Junio C Hamano on 07 April 2013, 22:27:23 UTC
Git 1.8.2.1
Tip revision: 5bda18c
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