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

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

    Summary:
      Resolved still wasn't quite right. Added a lot of test cases and it definitely works (note: anything is always equal to anything|0)
    Revision:
      bazaar--devo--1.2--patch-11

    Patches applied:
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-14
       Now it really works, and the test cases prove it
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-15
       A LOT more test cases for resolved
    

    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-14
     jblack at gnuarch.org--2004/baz--resolve--1.2--patch-15
     thelove at canonical.com/bazaar--devo--1.2--patch-11