From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Fri, 17 May 2013 21:10:08 +0000 (-0500)
Subject: remote-hg: tests: fix hg merge
X-Git-Tag: v1.8.4-rc0~191^2~48
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0c27c12d21c6af3163ac4253c815e62c6bdd37f3?ds=sidebyside;hp=0c27c12d21c6af3163ac4253c815e62c6bdd37f3

remote-hg: tests: fix hg merge

Let's specify a merge tool, otherwise mercurial might open one and hang
our tests waiting for user input.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---