[MERGE] Update docs to reflect conflict-handling difference

[Aaron Bentley]

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

Hi all,

Since LCA merge was added to Bazaar, a difference from merge3's conflict
handling was found.  This patch updates the doc to mention it.

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

iD8DBQFH1pfE0F+nu1YWqI0RAoeKAJoDd+W25O5iVrWCY6RK7LwLIOByZACfUC8M
kBGzKQwWMyx6pyglHwo2tc4=
=1N3Q
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: doc-update-3158.patch
Type: text/x-diff
Size: 3860 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080311/4493e45e/attachment.bin