tests/test-merge-remove.t

27162:4ab69be0ea15

Those who use force will lose

  $ 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

27163:27b89a0957ec

Those who use force will lose

  $ hg merge -f
  remote changed bar which local deleted
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? 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