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

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

    Summary:
      merge conflict detection fix from robert.collins at canonical.com--general/bazaar--merge--1.1
    Revision:
      bazaar--devo--1.1--patch-48

    Patches applied:
    
     * robert.collins at canonical.com--general/bazaar--devel--1.1--patch-43
       merge conflict detection fix from robert.collins at canonical.com--general/bazaar--merge--1.1
    
     * robert.collins at canonical.com--general/bazaar--merge--1.1--base-0
       tag of robert.collins at canonical.com--general/bazaar--devel--1.1--patch-41
    
     * robert.collins at canonical.com--general/bazaar--merge--1.1--patch-1
       test three-way does not conflict on repeated hunks
    
     * robert.collins at canonical.com--general/bazaar--merge--1.1--patch-2
       trivial test for merge3 merging of hunks
    
     * robert.collins at canonical.com--general/bazaar--merge--1.1--patch-3
       fix up star-merge three way conflict detection
    

    modified files:
     libarch/apply-changeset.c tests/test-star-merge.sh

    new patches:
     robert.collins at canonical.com--general/bazaar--devel--1.1--patch-43
     robert.collins at canonical.com--general/bazaar--merge--1.1--base-0
     robert.collins at canonical.com--general/bazaar--merge--1.1--patch-1
     robert.collins at canonical.com--general/bazaar--merge--1.1--patch-2
     robert.collins at canonical.com--general/bazaar--merge--1.1--patch-3
     thelove at canonical.com/bazaar--devo--1.1--patch-48