https://github.com/git/git
Raw File
Tip revision: 66d2a6159f511924e7e0b8a21c93538879bfd622 authored by Johannes Schindelin on 04 December 2019, 18:58:46 UTC
Git 2.14.6
Tip revision: 66d2a61
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