https://github.com/git/git
Raw File
Tip revision: 75b2f01a0f642b39b0f29b6218515df9b5eb798e authored by Junio C Hamano on 09 August 2019, 22:20:04 UTC
Git 2.22.1
Tip revision: 75b2f01
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