[MERGE REVIEW] New conflict handling help

[Aaron Bentley]

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

This patch updates the help of merge, conflicts and resolve, to clarify
conflict handling.  Key points are:
1. Merge creates conflicts because there are problems it can't handle
2. You need to fix something.
3. After you're done, you can use resolve FILE or resolve --all

I'm being deliberately vague on specific conflict problems, because I
expect we'll soon have a whole bunch of different conflict types.

You can also find the changes in bzr.ab

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

iD8DBQFEBeXm0F+nu1YWqI0RAqz4AJ9SwgrldECthC4mtwHrSWJPRdCLmgCfS0xn
S36/BnSTdLEFEaKT4+jueHE=
=WFYH
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflict-docs.patch
Type: text/x-patch
Size: 2542 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060301/c2100eb1/attachment.bin