changeset 2298 | 4be9a79b49b1 |
parent 2283 | e506c14382fd |
child 3736 | ad3d5b4367cb |
--- a/tests/test-excessive-merge +++ b/tests/test-excessive-merge @@ -17,12 +17,12 @@ hg co 0 echo blah > b hg ci -m "branch b" -d "1000000 0" -HGMERGE=true hg up -m 1 +HGMERGE=true hg merge 1 hg ci -m "merge b/a -> blah" -d "1000000 0" hg co 1 -HGMERGE=true hg up -m 2 +HGMERGE=true hg merge 2 hg ci -m "merge a/b -> blah" -d "1000000 0" hg log @@ -43,4 +43,4 @@ echo hg debugindex .hg/data/a.i -hg verify \ No newline at end of file +hg verify