From: Petr Baudis <pasky@suse.cz>
Date: Fri, 03 Nov 2006 00:11:35 GMT
Subject: Re: [PATCH] Introducing cg-xxdiff for conflict resolution
Message-ID: <20061103001135.GN20017@pasky.or.cz>
In-Reply-To: <46a038f90611021540s14b6098p477a68ef00c826e9@mail.gmail.com>

Dear diary, on Fri, Nov 03, 2006 at 12:40:38AM CET, I got a letter
where Martin Langhoff <martin.langhoff@gmail.com> said that...
> On 9/25/06, Petr Baudis <pasky@suse.cz> wrote:
> >> >But I can adjust such details when applying your patch.
> >>
> >> Great! -- I'm travelling and at an airport "free access" computer. It
> >> should be illegal to run airports without free wifi in this day and
> >> age.
> >
> >Heartily agreed.
> 
> Paski, did this one get dropped? Change of heart? Heart attack?

Hmm, I thought we've agreed to go for the cg-resolve solution
instead...?

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
#!/bin/perl -sp0777i<X+d*lMLa^*lN%0]dsXx++lMlN/dsM0<j]dsj
$/=unpack('H*',$_);$_=`echo 16dio\U$k"SK$/SM$n\EsN0p[lN*1