[PATCH hglib] tests: adjust test-merge for mercurial 3.7

[Yuya Nishihara]

On Fri, 19 Feb 2016 19:25:12 +0100, Julien Cristau wrote:
> # HG changeset patch
> # User Julien Cristau <julien.cristau at logilab.fr>
> # Date 1455905790 -3600
> #      Fri Feb 19 19:16:30 2016 +0100
> # Node ID c391c32f600461ccac39ae4f69c0480bf8b5e9c5
> # Parent  028f66e8e3ca2da74dfb2cfa1802af5320349e82
> tests: adjust test-merge for mercurial 3.7
> 
> As of changeset 88d5db4b155c, the noninteractive handler for merge
> leaves conflicting files unresolved.

Looks good to me, thanks!