tests/test-resolve.t

21264:4e932dc5c113

resolve -l should contain an unresolved entry

  $ hg resolve -l
  U file

resolve the failure

  $ echo resolved > file
  $ hg resolve -m file
  $ hg commit -m 'resolved'

21265:232de244ab6f

resolve -l should contain an unresolved entry

  $ hg resolve -l
  U file

resolving an unknown path emits a warning
  $ hg resolve -m does-not-exist
  arguments do not match paths that need resolved

resolve the failure

  $ echo resolved > file
  $ hg resolve -m file
  $ hg commit -m 'resolved'