Content - 9b6355b98a71da2627b68c6543cea4f2515b8d54 - 42cb085/mergetools/diffmerge

Staging
v0.8.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: 4e42405f00ecbbee412846f48cb0253efeebe726 authored by Junio C Hamano on 28 May 2021, 04:05:29 UTC
Git 2.32-rc2

Tip revision: 4e42405

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
}

exit_code_trustable () {
	true
}