[MERGE] Better error for selected-file commit of merges

[Aaron Bentley]

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

Hi all,

This patch causes selected-file commit of merges to generate a
reasonable error message, rather than a traceback.

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

iD8DBQFGUaoh0F+nu1YWqI0RAmOYAJ9/pymdtOd/N4ZI30qNXaG9fUDaYQCdFG9i
eJ87fDWgEaVXmBAXQLhwxSc=
=bbto
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: selected-file-commit.patch
Type: text/x-patch
Size: 3722 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070521/3994f397/attachment.bin