aaron.bentley at utoronto.ca
Wed Sep 28 17:22:47 BST 2005
-----BEGIN PGP SIGNED MESSAGE-----
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.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar