view tests/test-issue1089.t @ 26527:b4aab4223102

filemerge.filemerge: make a tuple containing merge paths on disk We're going to need this same tuple elsewhere.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 07 Oct 2015 21:21:56 -0700
parents 2fc86d92c4a9
children 4441705b7111
line wrap: on
line source

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 (glob)
  $ 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 (glob)
  $ cd b

Relative delete:

  $ hg ci -m m ../a

  $ cd ..