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-10

2005-02-02 GMT	Canonical.com Patch Queue Manager <pqm at canonical.com>	patch-10

    Summary:
      Fixes for resolved
    Revision:
      bazaar--devo--1.2--patch-10

    Patches applied:
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-13
       Two related fixes for bug #6081: commit during conflicted state and baz status lying
    

    modified files:
     libarch/conflict-handling.c libarch/conflict-handling.h
     tests/test-conflicts.sh

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