diff -r ee78135b2f45 -r 4bad80f1aad3 tests/test-sharing.t --- a/tests/test-sharing.t Mon Jun 04 01:28:02 2018 +0530 +++ b/tests/test-sharing.t Wed Jun 06 03:26:47 2018 +0530 @@ -505,7 +505,14 @@ 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) Use evolve to fix the divergence. - $ HGMERGE=internal:other hg evolve --content-divergent + $ cat > editor.sh < #!/bin/sh + > cat > \$1 < fix bug 24 (v2 by bob) + > ENDOF + > EOF + + $ HGEDITOR='sh ./editor.sh' HGMERGE=internal:other hg evolve --content-divergent merge:[5] fix bug 24 (v2 by bob) with: [6] fix bug 24 (v2 by alice) base: [4] fix bug 24 (v1)