[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] diff markers/ star merge
From: |
Dimitrie O. Paun |
Subject: |
Re: [Gnu-arch-users] diff markers/ star merge |
Date: |
Sun, 21 Nov 2004 17:22:45 -0500 |
User-agent: |
Mutt/1.4.1i |
On Sun, Nov 21, 2004 at 05:11:48PM -0500, Aaron Bentley wrote:
> Zenaan Harkness wrote:
>
> >So, I can tla undo, tla star-merge then tla redo, except when I tla redo
> >I get the .rej conflict files rather than diff3 in-file markers.
>
> I realize that .rej files may be unfamiliar, but now that I'm used to
> them, I find them quite readable. The top half shows the text the patch
> was expecting, the bottom shows what the patch tried to turn it into.
Maybe, but I still like the inline markers a *lot* more.
How can one get them?
--
Dimi.
- [Gnu-arch-users] diff markers/ star merge, Zenaan Harkness, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge, Aaron Bentley, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge,
Dimitrie O. Paun <=
- Re: [Gnu-arch-users] diff markers/ star merge, John A Meinel, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge, Aaron Bentley, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge, John A Meinel, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge, Aaron Bentley, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge, John A Meinel, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge, Aaron Bentley, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge, Zenaan Harkness, 2004/11/21
- Re: [Gnu-arch-users] diff markers/ star merge, Dimitrie O. Paun, 2004/11/21
- [Gnu-arch-users] Re: diff markers/ star merge, Matthieu Moy, 2004/11/21
- [Gnu-arch-users] Re: diff markers/ star merge, Matthieu Moy, 2004/11/21