[PQM/MERGE] Merge directive support

[Daniel Watkins]

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.

This patch depends only on my 'fix-tests' work.

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