Undo a wrong merge with Bazaar

[Eli Zaretskii]

> From: TRIDENT JOB <trident_job at hotmail.com>
> CC: "bazaar at lists.canonical.com" <bazaar at lists.canonical.com>
> Date: Mon, 30 Jun 2014 19:53:52 +0000
> 
> If I continue to use this trunk, BranchA could not be merge again in trunk by developers, as the merge was memorized (already done but some files were reverted).That's the limit of such DVCS tools ...

The first time you wanted to merge again, you could begin by
cherry-picking the revisions that are memorized.