Content - 85ac7201571ed34c35a3613b97bd1b82982e0d61 - 4ba58c3/mergetools/diffmerge

Staging
v0.8.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: 9b7cbb315923e61bb0c4297c701089f30e116750 authored by Junio C Hamano on 17 December 2014, 19:49:34 UTC
Git 2.2.1

Tip revision: 9b7cbb3

diffmerge

diff_cmd () {
	"$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1
}

merge_cmd () {
	if $base_present
	then
		"$merge_tool_path" --merge --result="$MERGED" \
			"$LOCAL" "$BASE" "$REMOTE"
	else
		"$merge_tool_path" --merge \
			--result="$MERGED" "$LOCAL" "$REMOTE"
	fi
	status=$?
}