[PATCH] Use merge3 for text merging

[Martin Pool]

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.

-- 
Martin