Content - f138cb4e731018b40426337eb8062f40512df088 - e640c7a/mergetools/diffmerge

Staging
v0.8.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: ac84098b7e32406a982ac01cc76a663d5605224b authored by Junio C Hamano on 28 October 2016, 16:02:44 UTC
Git 2.10.2

Tip revision: ac84098

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
}