Hi Duy, On Wed, 6 Jul 2016, Duy Nguyen wrote: > On Tue, Jul 5, 2016 at 1:23 PM, Johannes Schindelin > <johannes.schindelin@xxxxxx> wrote: > > The vast majority of error messages in Git's source code which report a > > bug use the convention to prefix the message with "BUG:". > > > > As part of cleaning up merge-recursive to stop die()ing except in case of > > detected bugs, let's just make the remainder of the bug reports consistent > > with the de facto rule. > > If you search 'die(_("bug:' in this patch, you'll find 5 instances > where _() should be gone too. I should have known better. Vasco's i18n work already conflicts seriously with what I have in this patch series. This proves once again, beyond any doubt, that one should refrain from introducing patches that have little to do with the purpose of the patch series. So as far as this here patch series goes, let's re-focus on the recursive merge code again, okay? Ciao, Dscho -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html