Content - f138cb4e731018b40426337eb8062f40512df088 - efc8d78/mergetools/diffmerge

Staging
v0.8.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: 0f8e831356d4f1a34baf46bb1a6b2d4c89ec9cb8 authored by Junio C Hamano on 18 May 2016, 21:45:08 UTC
Git 2.8.3

Tip revision: 0f8e831

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
}