| commit | 0c27c12d21c6af3163ac4253c815e62c6bdd37f3 | |
| author | Felipe Contreras <felipe.contreras@gmail.com> | |
| Fri, 17 May 2013 21:10:08 +0000 (17 16:10 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 21 May 2013 18:59:48 +0000 (21 11:59 -0700) | ||
| tree | 01ef38f430a50ad7b09245e3aa0031e9ca541252 | treesnapshot (tar.gz zip) |
| parent | 02a607260fdbaed7717935df68fb76b1a6e577c0 | commitdiff |
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>
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>
| contrib/remote-helpers/test-hg-hg-git.sh | diffblobblamehistory |