[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Re: <<< conflict markers
From: |
Stefan Monnier |
Subject: |
Re: [Gnu-arch-users] Re: <<< conflict markers |
Date: |
14 Apr 2004 17:10:34 -0400 |
User-agent: |
Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 |
>> > diff3-style conflict markers really only make sense when the program
>> > creating them has three files on hand: ANCESTOR, MINE, and YOURS.
>> > `replay', `redo', etc. all work (currently) on the basis of diffs, not
>> > 3-way merges.
>> One exception: `update' could very well use diff3.
> It currently does not keep a copy handy, so it's not _that_ simple.
Well, I don't know much about internals, so I'm only speaking from
the point of view of the functionality.
>> But it would have the same effect as `tla star-merge --three-way', so it
>> would be a bit redundant.
> But star-merge is far less efficient for this.
Sounds like a good reason to improve star-merge's performance ;-).
>> I wish there was a tool that would do the guessing and turn the .rej
>> into conflict markers. Can't be done reliably in general, but it
> There is: wiggle
Ha! Way cool! Thanks!
Stefan
- [Gnu-arch-users] <<< conflict markers, Jani Monoses, 2004/04/14
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/14
- Re: [Gnu-arch-users] Re: <<< conflict markers, Tom Lord, 2004/04/14
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Stefan Monnier, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Tom Lord, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Aaron Bentley, 2004/04/15
- Re: [Gnu-arch-users] Re: <<< conflict markers, Tom Lord, 2004/04/15