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 

   298 

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

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

   299   abort: unshelve already in progress

   300   abort: unshelve already in progress

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

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

   301   [255]

   302   [255]