Mercurial > hg
view tests/test-convert-hg-source.out @ 6998:ddfcefab8b97
merge with -stable
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sat, 06 Sep 2008 17:04:01 +0200 |
parents | 368a4ec603cc |
children | 8e7130a10f3b |
line wrap: on
line source
created new head merging baz and foo to baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) 1 files updated, 0 files merged, 1 files removed, 0 files unresolved merging foo and baz to baz 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) created new head initializing destination new repository scanning source... sorting... converting... 5 add foo bar 4 change foo 3 make bar and baz copies of foo 2 merge local copy 1 merge remote copy 0 mark baz executable comparing with ../orig searching for changes no changes found