[PATCH 5 of 6 bid merge v2] merge: let manifestmerge emit 'keep' actions when keeping wd version

[Matt Mackall]

On Mon, 2014-04-07 at 02:19 +0200, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski at unity3d.com>
> # Date 1396829548 -7200
> #      Mon Apr 07 02:12:28 2014 +0200
> # Node ID b8eaf05d1ce2dcacbfcf0168053568cd539f561c
> # Parent  1cd8e01c37a5fff8a64898f6dc52df5dd332d5ac
> merge: let manifestmerge emit 'keep' actions when keeping wd version

I've queued patches 2, 3, and 5 here, thanks.

-- 
Mathematics is the supreme nostalgia of our time.