view tests/test-backwards-remove.t @ 35482:c240657febb7

templater: drop unneeded resources from conflict-marker data Follow-up for 32c278eb876f and f1c54d003327.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 22 Dec 2017 21:22:49 +0900
parents 4c94b6d0fb1c
children 5c2a4f37eace
line wrap: on
line source

  $ hg init
  $ echo This is file a1 > a
  $ hg add a
  $ hg commit -m "commit #0"
  $ ls
  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