[PATCH] Use merge3 for text merging

[Robert Collins]

On Wed, 2005-07-27 at 05:08 +1000, Martin Pool wrote:
> On 26 Jul 2005, Robey Pointer <robey at lag.net> wrote:
> > Slightly unrelated, but this is one thing that bugs me a lot about tla:
> > 
> > I'd really like to shout out in favor of some kind of inline conflict  
> > marking, even if it's not ">>>>>>>>".  tla's habit of dropping little  
> > *.orig and *.rej files and making me pick up the pieces is one of my  
> > pet peeves.  I noticed that bzr currently does the same thing  
> > (*.BASE, etc) and am hoping it's just a temporary thing. :)
> 
> I agree.  The bzrlib.merge module inserts those  fishbone conflict markers.
> 
> I think having the .BASE files as well is nice, in case you want them.
> But this could be an option.

Right - the C baz's use of .orig and .rej when doing three way merges is
deliberate and has both proponents and detractors. On the plus side you
tell people expecting .orig and .rej (which is what patch does) to look
in the three-way merged file, on the minus side you do create noise in
the tree.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050727/0c356a97/attachment.pgp