[PATCH] merge: also allow 'e' action with experimental.updatecheck=noconflict

[Yuya Nishihara]

On Mon, 13 Mar 2017 22:16:19 -0700, Martin von Zweigbergk via Mercurial-devel wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz at google.com>
> # Date 1489467523 25200
> #      Mon Mar 13 21:58:43 2017 -0700
> # Node ID bed0d8465c94c4f19f3bc32b8e427b2d23fa6cda
> # Parent  3d3109339b57341b333c1112beb41dd281fa944a
> merge: also allow 'e' action with experimental.updatecheck=noconflict

Makes sense. Queued, thanks.