tests/test-convert-hg-source.out
author Steve Borho <steve@borho.org>
Mon, 04 Feb 2008 19:38:34 -0600
changeset 6025 f2335246e5c7
parent 5811 180a3eee4b75
child 6336 4b0c9c674707
permissions -rw-r--r--
filemerge: wrap quotes around tool path

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