Submitter | phabricator |
---|---|
Date | Nov. 17, 2020, 6:48 a.m. |
Message ID | <differential-rev-PHID-DREV-vfeehkwlb2dsba73olwp-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/47610/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/tests/test-shelve.t b/tests/test-shelve.t --- a/tests/test-shelve.t +++ b/tests/test-shelve.t @@ -810,6 +810,9 @@ ? foo/foo $ hg bookmark \* test (4|13):33f7f61e6c5e (re) +BROKEN: 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')