tests/test-update-branches.t

44456:09f3e003fc2a

  R a
  $ hg ci -m empty
  nothing changed
  [1]
  $ hg resolve -l
  R a

Change/delete conflict is not allowed
  $ hg up -qC 3
  $ hg rm foo
  $ hg up -q 4

44457:6a34e438461b

  R a
  $ hg ci -m empty
  nothing changed
  [1]
  $ hg resolve -l

Change/delete conflict is not allowed
  $ hg up -qC 3
  $ hg rm foo
  $ hg up -q 4