306   (see 'hg resolve', then 'hg unshelve --continue')

   306   (see 'hg resolve', then 'hg unshelve --continue')

   307   [255]

   307   [255]

   308 

   308 

   309   $ hg revert -r . a/a

   309   $ hg revert -r . a/a

   310   $ hg resolve -m a/a

   310   $ hg resolve -m a/a

   312 

   312 

   313   $ hg commit -m 'commit while unshelve in progress'

   313   $ hg commit -m 'commit while unshelve in progress'

   314   abort: unshelve already in progress

   314   abort: unshelve already in progress

   315   (use 'hg unshelve --continue' or 'hg unshelve --abort')

   315   (use 'hg unshelve --continue' or 'hg unshelve --abort')

   316   [255]

   316   [255]