equal
deleted
inserted
replaced
1168 warning: conflicts while merging root! (edit, then use 'hg resolve --mark') |
1168 warning: conflicts while merging root! (edit, then use 'hg resolve --mark') |
1169 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
1169 unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') |
1170 [1] |
1170 [1] |
1171 $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate |
1171 $ sed 's/ae8c668541e8/123456789012/' .hg/shelvedstate > ../corrupt-shelvedstate |
1172 $ mv ../corrupt-shelvedstate .hg/histedit-state |
1172 $ mv ../corrupt-shelvedstate .hg/histedit-state |
1173 $ hg unshelve --abort |& grep 'rebase aborted' |
1173 $ hg unshelve --abort 2>&1 | grep 'rebase aborted' |
1174 rebase aborted |
1174 rebase aborted |
1175 $ hg up -C . |
1175 $ hg up -C . |
1176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1176 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |