https://github.com/git/git
Raw File
Tip revision: 4d0b43aa765a0056c88381eea862364c95e358ca authored by Johannes Schindelin on 17 March 2022, 09:57:52 UTC
Git 2.34.2
Tip revision: 4d0b43a
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