Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-merge1 @ 3853:c0b449154a90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch to the .hg/store layout, fix the tests
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 01 Dec 2006 13:34:09 +0100
parents 764688cf51e5
children
comparison
equal deleted inserted replaced
3852:8a9a1a7e1698 3853:c0b449154a90
21 echo "merge" 21 echo "merge"
22 hg merge -y --debug 22 hg merge -y --debug
23 hg status -AC 23 hg status -AC
24 cat b 24 cat b
25 hg ci -m "merge" -d "0 0" 25 hg ci -m "merge" -d "0 0"
26 hg debugindex .hg/data/b.i 26 hg debugindex .hg/store/data/b.i
27 hg debugrename b 27 hg debugrename b