view tests/test-issue1089.t @ 48584:74973a6d4e67

filemerge: always define a "base" label

It simplifies the code and improves the conflict markers to always
have the "base" label defined.

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

https://bz.mercurial-scm.org/1089

  $ hg init
  $ mkdir a
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b
  $ hg ci -m m a

  $ mkdir a b
  $ echo a > a/b
  $ hg ci -Am m
  adding a/b

  $ hg rm a
  removing a/b
  $ cd b

Relative delete:

  $ hg ci -m m ../a

  $ cd ..