equal
deleted
inserted
replaced
808 $ hg st |
808 $ hg st |
809 M a/a |
809 M a/a |
810 ? foo/foo |
810 ? foo/foo |
811 $ hg bookmark |
811 $ hg bookmark |
812 \* test (4|13):33f7f61e6c5e (re) |
812 \* test (4|13):33f7f61e6c5e (re) |
|
813 BROKEN: there shouldn't be a merge state |
|
814 $ hg resolve -l |
|
815 R a/a |
813 $ hg unshelve |
816 $ hg unshelve |
814 unshelving change 'test' |
817 unshelving change 'test' |
815 temporarily committing pending changes (restore with 'hg unshelve --abort') |
818 temporarily committing pending changes (restore with 'hg unshelve --abort') |
816 rebasing shelved changes |
819 rebasing shelved changes |
817 merging a/a |
820 merging a/a |