[MERGE] Status should not special case conflicts

[Robert Collins]

Status currently special cases showing of conflicts based on whether the
tree is the 'working tree' or not. In fact, all trees have conflicts()
methods, so there is no need to special case it - we just need to show
the conflicts from the new tree.

Eventually I plan to make conflicts be exposed as part of the tree
delta, which then lets status be purely a display of a tree delta, which
is what we need for dirstate.

Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: status-treat-conflicts-as-regular-tree-interface.patch
Type: text/x-patch
Size: 1168 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060714/2e0a8230/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060714/2e0a8230/attachment.pgp