Mercurial > hg-stable
view tests/test-issue1089.t @ 23111:0dae9147c3b6 stable
help: refer ":merge3" instead of "internal:merge3"
According to warning message (introduced by 38e0363dcbe0) in
filemerge.py, the former should be used as official name.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 01 Nov 2014 02:43:08 +0900 |
parents | f2719b387380 |
children | 2fc86d92c4a9 |
line wrap: on
line source
http://mercurial.selenic.com/bts/issue1089 $ 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 ..