branch | stable |
changeset 11451 | 51021f4c80b5 |
parent 8167 | 6c82beaaa11a |
--- a/tests/test-resolve Wed Jun 23 16:54:12 2010 -1000 +++ b/tests/test-resolve Sun Jun 27 23:12:05 2010 +0200 @@ -25,3 +25,9 @@ echo % resolve -l, should be empty hg resolve -l + +# test crashed merge with empty mergestate +mkdir .hg/merge +touch .hg/merge/state +echo % resolve -l, should be empty +hg resolve -l