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

[Miles Bader]

On Thu, Sep 25, 2003 at 02:00:42AM +0200, Denys Duchier wrote:
> What would be good would be if diff could (1) ignore indentation for
> the purpose of matching, (2) but retain the differences for the
> 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.  Ignored lines are ignored
for matching but are still significant if they happen to be included in a
hunk that's output for some non-ignored difference.

-Miles
-- 
Somebody has to do something, and it's just incredibly pathetic that it
has to be us.  -- Jerry Garcia