diff tests/test-merge-default @ 10504:d2c1fc440533 stable

test-merge-default: make content of test repo clearer.
Makes it easier to understand and modify the test.
(issue2043).

--- a/tests/test-merge-default	Thu Feb 18 20:47:12 2010 +0100
+++ b/tests/test-merge-default	Mon Feb 15 15:07:21 2010 -0500
@@ -4,18 +4,18 @@
 echo a > a
 hg commit -A -ma
 
-echo a >> a
+echo b >> a
 hg commit -mb
 
-echo a >> a
+echo c >> a
 hg commit -mc
 
 hg up 1
-echo a >> a
+echo d >> a
 hg commit -md
 
 hg up 1
-echo a >> a
+echo e >> a
 hg commit -me
 
 hg up 1
@@ -24,6 +24,7 @@
 
 hg up
 echo % should fail because \> 2 heads
+export HGMERGE=internal:other
 hg merge
 
 echo % should succeed
@@ -43,7 +44,7 @@
 hg merge
 
 hg up 3
-echo a >> a
+echo f >> a
 hg branch foobranch
 hg commit -mf
 echo % should fail because merge with other branch