Andrew's git / gitweb.git / diff
?
remote-hg: tests: fix hg merge
authorFelipe Contreras <felipe.contreras@gmail.com>
Fri, 17 May 2013 21:10:08 +0000 (16:10 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 May 2013 18:59:48 +0000 (11:59 -0700)
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>
No differences found