--- a/tests/test-sharing.t Sun Jun 22 12:01:11 2014 -0400
+++ b/tests/test-sharing.t Sun Jun 22 20:10:07 2014 -0400
@@ -271,7 +271,7 @@
o 0:0dc9c9f6ab91 public create new project
Merge the trouble away.
- $ HGMERGE=internal:local hg merge
+ $ hg merge --tool internal:local
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg commit -m merge
@@ -294,7 +294,7 @@
# XXX hg evolve does not solve this trouble! bug in evolve?
#Evolve the trouble away.
-# $ HGMERGE=internal:local hg evolve --all
+# $ hg evolve --all --tool=internal:local
# merge:[5] fix bug 24 (v2 by bob)
# with: [6] fix bug 24 (v2 by alice)
# base: [3] fix bug 24 (v1)