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)
commit0c27c12...21c6af3163ac4253c815e62c6bdd37f3
tree01ef38f...30a50ad7b09245e3aa0031e9ca541252copy hash to clipboard (tree)
parent02a6072...0fdbaed7717935df68fb76b1a6e577c0copy hash to clipboard (diff)
contrib/remote-helpers/test-hg-hg-git.sh