[MERGE] Update docs to reflect conflict-handling difference

[John Arbash Meinel]

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

Aaron Bentley wrote:
| 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

BB:approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFH1pw9JdeBCYSNAAMRArt0AJ9clhrgqA2wr+1ryp9uzfAXWAACGQCgvmY6
PkIcUlfJZ8la5VhH7j3gtqk=
=hEnN
-----END PGP SIGNATURE-----