[Gnu-arch-users] Re: how to recover from large conflicts?

[Miles Bader]

address@hidden writes:
> > Actually that's exactly how `diff -l' _does_ work.
> 
> not here! -l is for pagination, and neither -b nor -w do what I want.
> Here is a little experiment that's reasonably close to my situation:

Oops, my bad, I was thinking of `patch -l' (makes patch be tolerant of
whitespace differences durign patching).

-Miles
-- 
We have met the enemy, and he is us.  -- Pogo