[PATCH] Use merge3 for text merging

[Scott James Remnant]

On Sun, 2005-07-31 at 18:25 -0700, Robey Pointer wrote:

> If bzr dropped *.rej files but remembered them, and I had a simple  
> command I could use to resolve conflicts & clean up those *.rej  
> files, I'd be happy.  I just hate how tla drops the *.rej files and  
> leaves the merging and cleanup for me to do manually.  I can't see  
> that scaling past very tiny projects.
> 
Baz does something similar, it has a "baz resolved" command, but then
leaves the .rej and .orig files around as well!  Of course, as an added
Brucie Bonus, if you delete them yourself first you can't resolve the
conflict!

<fx: sound of head hitting desk>

Scott
-- 
Scott James Remnant
scott at ubuntu.com
-------------- 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/20050815/061956b9/attachment.pgp