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

[Andrew Suffield]

On Thu, Sep 25, 2003 at 12:37:10PM +0200, address@hidden wrote:
> Miles Bader <address@hidden> writes:
> 
> >> purpose of producing patches.  I.e. basically I would like these two
> >> lines to (in a way) "match":
> >> 
> >>    AAA
> >>            AAA
> >> 
> >> but still produce a patch:
> >> 
> >> -  AAA
> >> +          AAA
> >
> > Actually that's exactly how `diff -l' _does_ work.
> 
> not here! -l is for pagination, and neither -b nor -w do what I want.

patch -l

-- 
  .''`.  ** Debian GNU/Linux ** | Andrew Suffield
 : :' :  http://www.debian.org/ |
 `. `'                          |
   `-             -><-          |

signature.asc
Description: Digital signature