tests/test-shelve.t

21539:0c4077905932

  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     second
  
  $ hg resolve -l
  abort: resolve command not applicable when not merging
  [255]
  $ hg status
  A foo/foo
  ? a/a.orig

try to continue with no unshelve underway

21541:6062593d8b06

  user:        test
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     second
  
  $ hg resolve -l
  $ hg status
  A foo/foo
  ? a/a.orig

try to continue with no unshelve underway