Mercurial > hg
view tests/test-issue1089.t @ 27136:29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
We're going to use this to verify the merge state in upcoming patches.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 25 Nov 2015 14:26:46 -0800 |
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 ..