log tests/test-merge.py @ 173:8c4d24b58c23 2.1

age author description
Fri, 19 Feb 2016 19:16:30 +0100 Julien Cristau tests: adjust test-merge for mercurial 3.7 2.1