PQM and conflicts
aaron.bentley at utoronto.ca
Fri Aug 10 16:12:52 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
John Arbash Meinel wrote:
> Especially since every so often I clean up NEWS to conform to reST
> guidelines, which would probably get really screwed up by a custom merge
> algorithm. (Not to mention, we don't have the ability in bzr to specify
> a custom algorithm per-file anyway).
True, but you can specify a custom merge algorithm, and *it* can behave
differently for that single file.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar