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. */