From: Junio C Hamano Date: Thu, 08 Jul 2010 00:26:22 GMT Subject: Re: [PATCH v3] merge-recursive: use "up-to-date" instead of "uptodate" in error message for consistency Message-ID: <7vd3uystsh.fsf@alter.siamese.dyndns.org> In-Reply-To: <9aea70210996b395f5fc04ae48a372f9b51ba182.1278489069.git.nicolas.s.dev@gmx.fr> Nicolas Sebrecht writes: > Signed-off-by: Nicolas Sebrecht > --- > > The 07/07/10, Junio C Hamano wrote: > >> The "struct unpack_trees_error_msgs" mechanism was introduced so that we >> can change the Porcelain level messages without breaking the plumbing API, >> which these messages are part of. Please see 8ccba00 (unpack-trees: allow >> Porcelain to give different error messages, 2008-05-17) and fadd069 >> (merge-recursive: give less scary messages when merge did not start, >> 2009-09-07) for backstory. > > Oh, thanks. I was unaware of this mechanism and didn't care about what I was > touching. I suspect that the documentation patch talks about a nonexistent reality. See 8ccba00 again ;-)