diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2013-05-17 16:10:08 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-21 11:59:48 -0700 |
| commit | 0c27c12d21c6af3163ac4253c815e62c6bdd37f3 (patch) | |
| tree | 01ef38f430a50ad7b09245e3aa0031e9ca541252 /cache-tree.c | |
| parent | 02a607260fdbaed7717935df68fb76b1a6e577c0 (diff) | |
| download | git-0c27c12d21c6af3163ac4253c815e62c6bdd37f3.tar.gz git-0c27c12d21c6af3163ac4253c815e62c6bdd37f3.tar.xz | |
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>
Diffstat (limited to 'cache-tree.c')
0 files changed, 0 insertions, 0 deletions