From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 26 May 2007 00:52:09 GMT
Subject: Re: [PATCH 2/3] Documentation: Add definition of "evil merge" to GIT Glossary
Message-ID: <Pine.LNX.4.64.0705260151320.4648@racer.site>
In-Reply-To: <1180132662719-git-send-email-jnareb@gmail.com>

Hi,

On Sat, 26 May 2007, 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>>.

Funny. For me, an evil merge is an octopus.

Ciao,
Dscho