[MERGE] Status honours FILE parameters for conflicts (#127606)

[Aaron Bentley]

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

Hi all,

Here's a patch to make 'bzr status' honour FILE parameters for conflicts.

It extends select_conflicts to support recursive matches, and causes
show_tree_status to use select_conflicts when specific files are
provided as input.

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

iD8DBQFGpMCy0F+nu1YWqI0RArKFAJ48D6EoTKI8ygeiBdtLfqeHNrffnACdEacz
x4CDzNKjmawjMU2CSYd6YpI=
=nFMi
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: selected-path-conflicts.patch
Type: text/x-patch
Size: 10871 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070723/1b66bcc9/attachment.bin