From: Petr Baudis <pasky@suse.cz>
Date: Wed, 13 Sep 2006 21:50:49 GMT
Subject: Re: [RFC] Merge strategy 'applyreject'
Message-ID: <20060913215049.GP18896@pasky.or.cz>
In-Reply-To: <7v1wqf789j.fsf@assigned-by-dhcp.cox.net>

Dear diary, on Wed, Sep 13, 2006 at 11:43:04PM CEST, I got a letter
where Junio C Hamano <junkio@cox.net> said that...
> Petr Baudis <pasky@suse.cz> writes:
> > .rej files, what a nuisance to handle those... :)
> 
> You were who asked for "apply --reject", weren't you?

Yes, but the point of that was obviously different. (It's a nuisance,
but only when compared to the conflict markers (yes, a matter of opinion
of course).)

Thanks for it, BTW!

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Snow falling on Perl. White noise covering line noise.
Hides all the bugs too. -- J. Putnam