conflict status flag missing in `bzr update` output

[Riccardo Murri]

As of 0.91, the 'C' status flag letter is not printed in `bzr update` output,
even if the file is marked as conflicted.

Sample::

  # /tmp/a and /tmp/c are two branches
  rmurri@tanja:/tmp/b$ echo 1 > z
  rmurri@tanja:/tmp/b$ bzr add z
  added z
  rmurri@tanja:/tmp/b$ bzr ci -m z
  Committing revision 6 to "/tmp/b/".
  added z
  Committed revision 6.
  rmurri@tanja:/tmp/b$ echo 6 > z
  rmurri@tanja:/tmp/b$ cd ../a/
  rmurri@tanja:/tmp/a$ bzr pull --remember /tmp/b
  +N z
  All changes applied successfully.
  Now on revision 6.
  rmurri@tanja:/tmp/a$ echo 7 > z
  rmurri@tanja:/tmp/a$ bzr ci -m 7
  Committing revision 7 to "/tmp/a/".
  modified z
  Committed revision 7.
  rmurri@tanja:/tmp/a$ bzr push
  Using saved location: sftp://localhost/tmp/b/
  This transport does not update the working tree of: sftp://localhost/tmp/b/. See 'bzr help working-trees' for more information.
  Pushed up to revision 7.
  rmurri@tanja:/tmp/a$ cd ../c/
  rmurri@tanja:/tmp/b$ bzr update
   M z
  Text conflict in z
  1 conflicts encountered.
  Updated to revision 7.

I'm running Debian's bzr 0.91-2::

  $ LC_ALL=C apt-cache policy bzr
  bzr:
    Installed: 0.91-2
    Candidate: 0.91-2
    Version table:
   *** 0.91-2 0
          500 http://debian.fastweb.it unstable/main Packages
          100 /var/lib/dpkg/status
       0.18-1 0
          500 http://debian.fastweb.it testing/main Packages
       0.17-0ubuntu1 0
          500 http://bazaar-vcs.org ./ Packages
       0.16-0ubuntu1 0
          500 http://bazaar-vcs.org ./ Packages
       0.11-1.1 0
          990 http://debian.fastweb.it stable/main Packages