test-rename-merge1.out
22 lines
| 532 B
| text/plain
|
TextLexer
/ tests / test-rename-merge1.out
Matt Mackall
|
r3153 | checkout | ||
| 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | ||||
| merge | ||||
| resolving manifests | ||||
| overwrite None branchmerge True partial False | ||||
| ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c | ||||
|
Matt Mackall
|
r3251 | a: remote moved -> c | ||
|
Matt Mackall
|
r3153 | b2: remote created -> g | ||
|
Matt Mackall
|
r3252 | merging a and b to b | ||
|
Matt Mackall
|
r3251 | resolving a | ||
| my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c | ||||
| copying a to b | ||||
| removing a | ||||
|
Matt Mackall
|
r3153 | getting b2 | ||
|
Matt Mackall
|
r3251 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | ||
|
Matt Mackall
|
r3153 | (branch merge, don't forget to commit) | ||
|
Matt Mackall
|
r3251 | M b | ||
| a | ||||
| M b2 | ||||
| R a | ||||
| C c2 | ||||
|
Matt Mackall
|
r3153 | blahblah | ||