view .hgsigs @ 173:8c4d24b58c23 2.1

tests: adjust test-merge for mercurial 3.7 As of changeset 88d5db4b155c, the noninteractive handler for merge leaves conflicting files unresolved.
author Julien Cristau <julien.cristau@logilab.fr>
date Fri, 19 Feb 2016 19:16:30 +0100
parents bfd1c264f6cb
children 1085c904d8c0
line wrap: on
line source

c41442cb355d55ca152d5f13a95a6bf2ebc5b870 0 iD8DBQBOvGIzywK+sNU5EO8RAtNMAJ92vXmPkE35jrLlclws5h0TAFUHVQCfVjGoqNgnh+ZE7eI25Q/m555XvEU=