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

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

    Summary:
      Updated conflict handling code to use a rel_table so that undo can use it too
    Revision:
      bazaar--devo--1.2--patch-14

    Patches applied:
    
     * jblack at gnuarch.org--2004/baz--resolve--1.2--patch-17
       (code feature) resolved now uses a rel_table instead
    

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

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