test-merge8.out
10 lines
| 345 B
| text/plain
|
TextLexer
/ tests / test-merge8.out
Adrian Buehlmann
|
r9611 | updating to branch default | ||
Thomas Arendsen Hein
|
r3389 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
| pulling from ../a | ||||
| searching for changes | ||||
| adding changesets | ||||
| adding manifests | ||||
| adding file changes | ||||
| added 2 changesets with 2 changes to 1 files | ||||
| (run 'hg update' to get a working copy) | ||||
Matt Mackall
|
r4416 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||