PQM and conflicts

[Aaron Bentley]

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

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.

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

iD8DBQFGvIB00F+nu1YWqI0RAiX7AJ9YPQFmJixDL30gsmaX4mH0IXAgIgCfd/9r
FH/XnW/nJPZKOsyP2e42T1A=
=EmBo
-----END PGP SIGNATURE-----