[PATCH] Use merge3 for text merging

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robey Pointer 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 ">>>>>>>>".

bzr already does that.  It uses ">>>>>>>>".  My patch doesn't change that.

> 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. :)

No, it's intended to be long term.  Perhaps it could be optional.
It's intended for handling difficult merge scenarios-- the user can
invoke tools like meld on the three files to resolve the conflict.  It
also makes it easy to determine whether a merge operation resulted in
text conflicts.

What *I*'d like to do about this is implement 'bzr resolved [--all]', to
tell bzr that you've resolved the conflict, and it can delete the files.
 What do you think?

I'd even take it futher, and refuse to commit conflicted files.  But
people say I'm wierd.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFC5oxJ0F+nu1YWqI0RAjdzAJ4hJEYWzuwKcqh4QwNrqtEQxcL6BgCfT9rd
B4a4z1EfMMHw8JI9FnPCMlc=
=BPDo
-----END PGP SIGNATURE-----