[Savannah-help-public] Re: unicode merge failures 2007-03-04

[Miles Bader]

Kenichi Handa <address@hidden> writes:
> I think nothting wrong.  Here's the timeline of changes of
> process.c in HEAD and emacs-unicode-2:
>
>       HEAD                    emacs-unicode-2
> 02-23   my change
> 02-27                         your merging
> 02-27                         my change (cancel the above change)
> 03-01   my change
> 03-04                         you tried merging and faced with conflict

Ok, I think I'm mixing up some other stuff too.  Argh...

[Savannah-Hackers, please ignore my earlier mail.]

Thanks,

-Miles
-- 
We live, as we dream -- alone....