bzr questions

[Aaron Bentley]

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

Jordan Breeding wrote:

> Honestly, while I understand why it happens, and know that cvs also has
> the problem I have always found the messages a little annoying.

Me too.  I think it's a case of programs trying to be overprotective, by
warning the user that not all their output was consumed, so the results
may not be what they expected.

> Does bzr ever call out to an external merge program?

Yes, if you do "bzr merge --merge-type diff3 ..."  The conflict output
is also intended to be easy to use with three-way mergers like meld.

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

iD8DBQFDOsNX0F+nu1YWqI0RAr46AJ95n7vqqr6gNqQbNykfV9p2QEca5ACfXxH5
UYhYEf/jSTUA0HbBLe44rVs=
=rDnf
-----END PGP SIGNATURE-----