Changes to archive thelove@canonical.com/bazaar--devo--1.2

[pqm at canonical.com]

New revision thelove at canonical.com/bazaar--devo--1.2--patch-8

2005-01-31 GMT	Canonical.com Patch Queue Manager <pqm at canonical.com>	patch-8

    Summary:
      Announce how many files conflict during a merge (fixes #4738)
    Revision:
      bazaar--devo--1.2--patch-8

    Patches applied:
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-12
       Announce how many files conflict during a merge (fixes #4738)
    

    modified files:
     libarch/conflict-handling.c

    new patches:
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-12
     thelove at canonical.com/bazaar--devo--1.2--patch-8