mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 15:27:13 +03:00
6 lines
190 B
Plaintext
6 lines
190 B
Plaintext
merging a and b to b
|
|
warning: conflicts during merge.
|
|
merging b failed!
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges
|