update with conflicts suggests resolving with command that doesn't work

[Jamie Wilkinson]

a "baz update" on a working copy that i hadn't touched for a while ended with this:

* reapplying local changes
****************************************************
2 conflicted items in this tree. Please
resolve each conflict with baz "resolved 'filename'"
****************************************************

Well, it didn't tell me which files were had conflicts, and after trying the
finger macros baz lint baz status I found out where there were, so:
willow% baz status
* looking for <email address hidden>/filtergen--main--0.13--patch-125 to
compare with
* comparing to <email address hidden>/filtergen--main--0.13--patch-125

* The following 2 files are conflicted:

   SConstruct
   input/iptables-save/SConscript

willow% baz resolved SConstruct
Your conflict status has not changed

What? you just told me to do this. Trying again on the other file does nothing
either, trying both does nothing. At this point I've removed the .rej and .orig
files too, because on inspection decided the local patches were bogus and the
ordinary files were fine.

Finally tried the help, and it talks about a "package" option, which is
undocumented, but I tried
  baz resolved --all
and that finally allowed me to continue.

So, please fix the resolved subcommand so that it behaves as advertised.

[Robert Collins (lifeless)]

Thanks jaq, please use bzr instead.