changeset 45860 | 073bb7563931 |
parent 45859 | 781b09790633 |
child 46246 | 416ecdaa12df |
--- a/tests/test-shelve.t Mon Nov 16 22:38:36 2020 -0800 +++ b/tests/test-shelve.t Mon Nov 16 21:28:42 2020 -0800 @@ -810,9 +810,8 @@ ? foo/foo $ hg bookmark \* test (4|13):33f7f61e6c5e (re) -BROKEN: there shouldn't be a merge state +there shouldn't be a merge state $ hg resolve -l - R a/a $ hg unshelve unshelving change 'test' temporarily committing pending changes (restore with 'hg unshelve --abort')