git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 02a6072)
remote-hg: tests: fix hg merge
authorFelipe Contreras <redacted>
Fri, 17 May 2013 21:10:08 +0000 (16:10 -0500)
committerJunio C Hamano <redacted>
Tue, 21 May 2013 18:59:48 +0000 (11:59 -0700)
commit0c27c12d21c6af3163ac4253c815e62c6bdd37f3
tree01ef38f430a50ad7b09245e3aa0031e9ca541252tree | snapshot
parent02a607260fdbaed7717935df68fb76b1a6e577c0commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
contrib/remote-helpers/test-hg-hg-git.sh diff | blob | history
git clone https://git.99rst.org/PROJECT