[MERGE] Conflict handling docs (was: [RFC] Conflicts handling in status command)

[Aaron Bentley]

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

Guillermo Gonzalez wrote:
> 2007/7/23, Aaron Bentley <aaron.bentley at utoronto.ca>:

>> Actually, there are eight kinds of conflicts.

> I wasn't aware of all this kinds.

Well, that's not really surprising, since it's not documented anywhere.

Here is a patch to add some documentation about conflict handling.

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

iD8DBQFGpS8s0F+nu1YWqI0RAmWnAJ9CpkldbXTnFgW/oaJ7j7vmsY/URQCfWPi0
SnDeZMoIgUT8S70AA8yozhw=
=RwsW
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflict-doc.patch
Type: text/x-patch
Size: 14321 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070723/cfba6a9f/attachment.bin