tests: adjust test-merge for mercurial 3.7 As of changeset 88d5db4b155c, the noninteractive handler for merge leaves conflicting files unresolved.

#!/usr/bin/env python

import nose
from tests import with_hg

if __name__ == '__main__':
    nose.main(addplugins=[with_hg.WithHgPlugin()])