tests/test-resolve.t

21266:19d6fec60b81

resolve the failure

  $ echo resolved > file
  $ hg resolve -m file
  no unresolved files; you may continue your unfinished operation
  $ hg commit -m 'resolved'

resolve -l should error since no merge in progress

  $ hg resolve -l

21267:e4f451c8c05c

resolve the failure

  $ echo resolved > file
  $ hg resolve -m file
  no more unresolved files
  $ hg commit -m 'resolved'

resolve -l should error since no merge in progress

  $ hg resolve -l