test-merge-default: make content of test repo clearer.

Makes it easier to understand and modify the test.
(issue2043).

tests/test-merge-default

@@ -1,52 +1,53 b''
 #!/bin/sh
 
 hg init
 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
 echo % should fail because not at a head
 hg merge
 
 hg up
 echo % should fail because \> 2 heads
+export HGMERGE=internal:other
 hg merge
 
 echo % should succeed
 hg merge 2
 hg commit -mm1
 
 echo % should succeed - 2 heads
 hg merge -P
 hg merge
 hg commit -mm2
 
 echo % should fail because at tip
 hg merge
 
 hg up 0
 echo % should fail because 1 head
 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
 hg merge
 
 true

tests/test-merge-default.out

@@ -1,36 +1,36 b''
 adding a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail because not at a head
 abort: branch 'default' has 3 heads - please merge with an explicit rev
 (run 'hg heads .' to see heads)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail because > 2 heads
 abort: branch 'default' has 3 heads - please merge with an explicit rev
 (run 'hg heads .' to see heads)
 % should succeed
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should succeed - 2 heads
-changeset:   3:903c264cdf57
-parent:      1:ba677d0156c1
+changeset:   3:ea9ff125ff88
+parent:      1:1846eede8b68
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     d
 
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should fail because at tip
 abort: there is nothing to merge
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % should fail because 1 head
 abort: there is nothing to merge - use "hg update" instead
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 marked working directory as branch foobranch
 created new head
 % should fail because merge with other branch
 abort: branch 'foobranch' has one head - please merge with an explicit rev
 (run 'hg heads' to see all heads)