https://github.com/git/git
Raw File
Tip revision: 06214d171b10e9474a0233dbc5187fd6b109ff2a authored by Johannes Schindelin on 12 February 2021, 14:49:50 UTC
Git 2.24.4
Tip revision: 06214d1
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