2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2008-04-11 00:02:24 +04:00
|
|
|
merging baz and foo to baz
|
2007-09-01 09:49:18 +04:00
|
|
|
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
|
2008-04-11 00:02:24 +04:00
|
|
|
merging foo and baz to baz
|
2007-09-01 09:49:18 +04:00
|
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
|
|
(branch merge, don't forget to commit)
|
2008-03-21 13:06:02 +03:00
|
|
|
created new head
|
2007-09-01 09:49:18 +04:00
|
|
|
initializing destination new repository
|
|
|
|
scanning source...
|
|
|
|
sorting...
|
|
|
|
converting...
|
2007-12-29 17:11:48 +03:00
|
|
|
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
|
2007-09-01 09:49:18 +04:00
|
|
|
comparing with ../orig
|
|
|
|
searching for changes
|
|
|
|
no changes found
|