Re: [PATCH 2/9] ll-merge: make callers responsible for showing warnings

From

Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Date

Dec 21, 2021, 21:19 UTC

Message-ID

<211221.868rwdr6wc.gmgdl@evledraar.gmail.com>

In-Reply-To

<d022176618d76943743940da0787291d51c9b4f0.1640109948.git.gitgitgadget@gmail.com>

On Tue, Dec 21 2021, Elijah Newren via GitGitGadget wrote:

> From: Elijah Newren <newren@gmail.com>

> +	if (status == LL_MERGE_BINARY_CONFLICT)
> +		warning("Cannot merge binary files: %s (%s vs. %s)",
> +			"base", "ours", "theirs");