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

[pqm at canonical.com]

New revision thelove at canonical.com/bazaar--devo--1.1--patch-42

2004-12-09 GMT	Canonical.com Patch Queue Manager <pqm at canonical.com>	patch-42

    Summary:
      make --three-way the default for star merge, and fix thus uncovered bugs.
    Revision:
      bazaar--devo--1.1--patch-42

    Patches applied:
    
     * robert.collins at canonical.com--general/bazaar--devel--1.1--patch-37
       make --three-way the default for star merge, and fix thus uncovered bugs.
    
     * robert.collins at canonical.com--general/bazaar--devel--1.1--patch-38
       check for old reject file path too
    

    modified files:
     commands/star-merge.c libarch/build-revision.c
     libarch/merge-three-way.c libarch/merge-three-way.h
     libarch/pristines.c libarch/proj-tree-lint.c
     libarch/star-merge.c

    new patches:
     robert.collins at canonical.com--general/bazaar--devel--1.1--patch-37
     robert.collins at canonical.com--general/bazaar--devel--1.1--patch-38
     thelove at canonical.com/bazaar--devo--1.1--patch-42