https://github.com/git/git
Raw File
Tip revision: fd59c5bdeeb50f18e86f36cbf7a0b82554621690 authored by Johannes Schindelin on 23 June 2022, 10:36:14 UTC
Git 2.36.2
Tip revision: fd59c5b
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