Mercurial > hg
view tests/test-issue1089.t @ 45860:073bb7563931
shelve: clear merge state after partial shelve
Differential Revision: https://phab.mercurial-scm.org/D9335
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 16 Nov 2020 21:28:42 -0800 |
parents | 4441705b7111 |
children | 55c6ebd11cb9 |
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 $ 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 ..