Mercurial > hg

view tests/test-convert-hg-source.out @ 5998:5d91f6e6f841

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clarify help for hg status and make it consistent.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 02 Feb 2008 14:49:31 +0100
parents 180a3eee4b75
children 4b0c9c674707
line wrap: on
line source

merging baz and foo
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
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
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