comparison tests/test-convert-clonebranches @ 6723:1fe6f365df2e

merge: only in-branch merges can be implicit
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 23 Jun 2008 15:02:52 +0200
parents e495f3f35b2d
children bb5ea66789e3
comparison
equal deleted inserted replaced
6722:197d54d82f8d 6723:1fe6f365df2e
15 hg up -qC 0 15 hg up -qC 0
16 hg branch branch0 16 hg branch branch0
17 echo b > b 17 echo b > b
18 hg ci -qAm addb 18 hg ci -qAm addb
19 hg up -qC 19 hg up -qC
20 hg merge 20 hg merge default
21 hg ci -qm mergeab 21 hg ci -qm mergeab
22 hg tag -ql mergeab 22 hg tag -ql mergeab
23 cd .. 23 cd ..
24 24
25 # Miss perl... sometimes 25 # Miss perl... sometimes