test-rename-dir-merge2.out
18 lines
| 462 B
| text/plain
|
TextLexer
/ tests / test-rename-dir-merge2.out
Matt Mackall
|
r4115 | adding a/f | ||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
Matt Mackall
|
r5610 | moving a/f to b/f | ||
|
Matt Mackall
|
r4115 | adding a/aa/g | ||
| pulling from ../r2 | ||||
| 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) | ||||
|
Matt Mackall
|
r4416 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | ||
|
Matt Mackall
|
r4115 | (branch merge, don't forget to commit) | ||
| M b/f | ||||
| A b/aa/g | ||||
| a/aa/g | ||||
| R a/aa/g | ||||
| R a/f | ||||