From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 29 Nov 2020 10:26:23 GMT
Subject: Re: [PATCH 05/20] merge-ort: add an err() function similar to one from merge-recursive
Message-ID: <87ft4sjw6o.fsf@evledraar.gmail.com>
In-Reply-To: <91516799e46ebbc91fb6b1811164fe7c9a15a3ad.1606635803.git.gitgitgadget@gmail.com>


On Sun, Nov 29 2020, Elijah Newren via GitGitGadget wrote:

> +		err(opt, _("collecting merge info failed for trees %s, %s, %s"),
> +		    oid_to_hex(&merge_base->object.oid),
> +		    oid_to_hex(&side1->object.oid),
> +		    oid_to_hex(&side2->object.oid));

(Sorry about the two E-Mails, didn't spot this at first). This error
message without context for translators is going to give them no idea
what %s/%s/%s are. Maybe this before it:

 /*
  * TRANSLATORS: The %s arguments are: 1) tree SHA-1 of a merge base 2-3) the
  * trees for the two trees we're merging.
  */