From: Jeff King <peff@peff.net>
Date: Wed, 25 May 2011 19:50:32 GMT
Subject: Re: Merge made by recursive?
Message-ID: <20110525195032.GC27260@sigill.intra.peff.net>
In-Reply-To: <7vvcwy37de.fsf@alter.siamese.dyndns.org>

On Wed, May 25, 2011 at 12:30:53PM -0700, Junio C Hamano wrote:

> I think so.  An earlier version of "git merge" used to say something like:
> 
>     Committed merge ..., made by resolve.
> 
> back in Sept 2005, so it is not so recent development. If we change it
> now, scripts in thousands of existing users hands might cringe instead,
> though.

I was going to say "those scripts are stupid and broken for parsing
stderr", but:

  1. We actually write this (and many other diagnostic messages) to
     stdout, not stderr. That seems weird and unusual.

  2. The message ends up in the reflog.

Also, most of the rest of the merge output has been gettext-ized, but
not this message. If we are going to declare it not parseable, should we
also be internationalizing it?

-Peff