[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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

From: Miles Bader
Subject: Re: [Gnu-arch-users] how to recover from large conflicts?
Date: Wed, 24 Sep 2003 20:12:48 -0400
User-agent: Mutt/1.3.28i

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.

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]