tests/test-backout.t

21265:232de244ab6f

  $ hg resolve --all --debug
  picked tool 'internal:merge' for foo (binary False symlink False)
  merging foo
  my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
   premerge successful
  $ hg status
  M foo
  ? foo.orig
  $ hg resolve -l
  R foo

21266:19d6fec60b81

  $ hg resolve --all --debug
  picked tool 'internal:merge' for foo (binary False symlink False)
  merging foo
  my foo@b71750c4b0fd+ other foo@a30dd8addae3 ancestor foo@913609522437
   premerge successful
  no unresolved files; you may continue your unfinished operation
  $ hg status
  M foo
  ? foo.orig
  $ hg resolve -l
  R foo