[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] NEW: three-way merges / conflict markers
From: |
Alexander Deruwe |
Subject: |
Re: [Gnu-arch-users] NEW: three-way merges / conflict markers |
Date: |
Wed, 24 Sep 2003 13:40:08 +0200 |
User-agent: |
Mutt/1.5.4i |
On Wed, Sep 24, 2003 at 01:04:22PM +0200, Jan Hudec wrote:
> On Wed, Sep 24, 2003 at 12:32:43 +0200, Alexander Deruwe wrote:
> > Any chance of getting a -t option in 'tla redo'? The conflict markers
> > are much easier to work with, and I just found myself wishing 'redo'
> > would support them as well.
>
> But you need wiggle for that...
>
> Recall that you don't have the full text of old and new files for the
> patch; just the diff.
Ah, right.
Alexander
- [Gnu-arch-users] NEW: three-way merges / conflict markers, Tom Lord, 2003/09/20
- Re: [Gnu-arch-users] NEW: three-way merges / conflict markers, Robert Collins, 2003/09/20
- Re: [Gnu-arch-users] NEW: three-way merges / conflict markers, Jan Hudec, 2003/09/22
- Re: [Gnu-arch-users] NEW: three-way merges / conflict markers, Karel Gardas, 2003/09/22
- Re: [Gnu-arch-users] NEW: three-way merges / conflict markers, Alexander Deruwe, 2003/09/24
- Re: [Gnu-arch-users] NEW: three-way merges / conflict markers, Jan Hudec, 2003/09/25
[Gnu-arch-users] Re: NEW: three-way merges / conflict markers, Miles Bader, 2003/09/24