mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
718de207ba
Fix up "already seen" logic Fix merge action in remote copy case Add status message Add lots of merge+copy/move test cases
23 lines
532 B
Plaintext
23 lines
532 B
Plaintext
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
|
|
a: remote moved -> c
|
|
b2: remote created -> g
|
|
merging a and b to b
|
|
resolving a
|
|
my a@f26ec4fc3fa3 other b@8e765a822af2 ancestor a@af1939970a1c
|
|
copying a to b
|
|
removing a
|
|
getting b2
|
|
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
M b
|
|
a
|
|
M b2
|
|
R a
|
|
C c2
|
|
blahblah
|