From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Wed, 17 Aug 2005 17:29:28 GMT
Subject: Re: [PATCH] Add merge detection to git-cvsimport
Message-ID: <pan.2005.08.17.17.29.26.687298@smurf.noris.de>
In-Reply-To: <46a038f9050816143646fa4137@mail.gmail.com>

Hi, Martin Langhoff wrote:

> this one is the
> most likely one to be from a bug in cvsps or the cvsimport logic.

That's not a bug in the import logic, just a failure of the CVS-merging
person to be consistent. (Which is hardly news. :-/ )

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
Reason:
	Bad, toxic entity, that foolish people use when they ought to use
	their inner voice, or angels, or intuition, or a gut feeling, or
	their hearts, or the I Ching.
		-- Fashionable Dictionary (www.butterfliesandwheels.com)