[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: how to recover from large conflicts?
From: |
Miles Bader |
Subject: |
[Gnu-arch-users] Re: how to recover from large conflicts? |
Date: |
26 Sep 2003 12:43:07 +0900 |
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
- Re: [Gnu-arch-users] how to recover from large conflicts?, (continued)
- Re: [Gnu-arch-users] how to recover from large conflicts?, Tom Lord, 2003/09/24
- Re: [Gnu-arch-users] how to recover from large conflicts?, Denys Duchier, 2003/09/24
- [Gnu-arch-users] Re: how to recover from large conflicts?, Samuel Tardieu, 2003/09/25
- Re: [Gnu-arch-users] Re: how to recover from large conflicts?, duchier, 2003/09/25
- [Gnu-arch-users] Re: how to recover from large conflicts?, Samuel Tardieu, 2003/09/25
- Re: [Gnu-arch-users] Re: how to recover from large conflicts?, duchier, 2003/09/25
- [Gnu-arch-users] Re: how to recover from large conflicts?,
Miles Bader <=
- Re: [Gnu-arch-users] how to recover from large conflicts?, Tom Lord, 2003/09/25
- Re: [Gnu-arch-users] how to recover from large conflicts?, Denys Duchier, 2003/09/25
- Re: [Gnu-arch-users] how to recover from large conflicts?, Tom Lord, 2003/09/25
Re: [Gnu-arch-users] how to recover from large conflicts?, Miles Bader, 2003/09/24