Content - f138cb4e731018b40426337eb8062f40512df088 - 991965b/mergetools/diffmerge

Staging
v0.8.1

visit type:

https://github.com/git/git

23 January 2022, 05:21:09 UTC

Tip revision: 7d722536dd86b5fbd0c0434bfcea5588132ee6ad authored by Junio C Hamano on 10 December 2015, 20:59:37 UTC
Git 2.7-rc0

Tip revision: 7d72253

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
}