tests/test-merge-remove.t

27136:29b08ca680b0

  $ hg merge -f
  remote changed bar which local deleted
  use (c)hanged version or leave (d)eleted? c
  merging foo1 and foo to foo1
  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ cat bar
  bleh
  $ hg st
  M bar

27137:25e4b2f000c5

  $ hg merge -f
  remote changed bar which local deleted
  use (c)hanged version or leave (d)eleted? c
  merging foo1 and foo to foo1
  0 files updated, 2 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)
  $ cat bar
  bleh
  $ hg st
  M bar