https://github.com/git/git
Raw File
Tip revision: 21a3e5016bb218dc9b016284c88ba685bc446b70 authored by Junio C Hamano on 17 March 2020, 20:34:12 UTC
Git 2.18.3
Tip revision: 21a3e50
opendiff
diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" | cat
}

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