[MERGE][PQM] Merge directive support

[Daniel Watkins]

On Wed, 9 Jul 2008 06:17:05 +0100
Daniel Watkins <daniel at daniel-watkins.co.uk> wrote:
> Attached is a patch which introduces support for merge directives into
> PQM.  The majority of the work is Aaron's, I have merely polished it
> up.  There are some slightly odd interactions with the VCS abstraction
> layer (though they can all be worked-around), but they disappear with
> the work I've been doing to remove the VCS abstraction.
Resubmitting for BB.

-- 
Daniel Watkins (Odd_Bloke)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge-directives.1.patch
Type: text/x-patch
Size: 40135 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080714/7c9fe3ae/attachment-0001.bin