test-merge10.out
20 lines
| 663 B
| text/plain
|
TextLexer
/ tests / test-merge10.out
Adrian Buehlmann
|
r9611 | updating to branch default | ||
Giorgos Keramidas
|
r4696 | 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 1 changesets with 1 changes to 1 files (+1 heads) | ||||
| (run 'hg heads' to see heads, 'hg merge' to merge) | ||||
| 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
Matt Mackall
|
r6512 | merging testdir/subdir/a and testdir/a to testdir/subdir/a | ||
|
Giorgos Keramidas
|
r4696 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
| (branch merge, don't forget to commit) | ||||
| M testdir/subdir/a | ||||
| diff -r d02b3fc32762 testdir/subdir/a | ||||
| --- a/testdir/subdir/a | ||||
| +++ b/testdir/subdir/a | ||||
|
Matt Mackall
|
r5863 | @@ -1,1 +1,1 @@ | ||
|
Giorgos Keramidas
|
r4696 | -a | ||
| +alpha | ||||