view tests/test-backwards-remove.t @ 47916:65e3d8028f2e

dirstate: drop the `_merge` method

It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.

Differential Revision: https://phab.mercurial-scm.org/D11351

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ ls -A
  .hg
  a
  $ echo This is file b1 > b
  $ hg add b
  $ hg commit -m "commit #1"
  $ hg co 0
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved

B should disappear

  $ ls -A
  .hg
  a