On Sat, May 26, 2007 at 12:37:39AM +0200, Jakub Narebski wrote: > +[[def_evil_merge]]evil merge:: > + An evil merge is a <<def_merge,merge>> that introduces changes that > + do not appear in any <<def_parent,parent>>. > + I'm a little skeptical. This term doesn't appear to be used anywhere in the current documentation, for example--are you sure it's worth including at this point? I don't know--I just don't want to end up with an entry for every piece of cute jargon that's been used as shorthand on the mailing list a few times. But if you think it's sufficiently useful and well-established, then OK. --b. - 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
