equal
deleted
inserted
replaced
292 (see 'hg resolve', then 'hg unshelve --continue') |
292 (see 'hg resolve', then 'hg unshelve --continue') |
293 [255] |
293 [255] |
294 |
294 |
295 $ hg revert -r . a/a |
295 $ hg revert -r . a/a |
296 $ hg resolve -m a/a |
296 $ hg resolve -m a/a |
297 no unresolved files; you may continue your unfinished operation |
297 no more unresolved files |
298 |
298 |
299 $ hg commit -m 'commit while unshelve in progress' |
299 $ hg commit -m 'commit while unshelve in progress' |
300 abort: unshelve already in progress |
300 abort: unshelve already in progress |
301 (use 'hg unshelve --continue' or 'hg unshelve --abort') |
301 (use 'hg unshelve --continue' or 'hg unshelve --abort') |
302 [255] |
302 [255] |