mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
30 lines
469 B
Plaintext
30 lines
469 B
Plaintext
|
adding a
|
||
|
|
? a
|
||
|
|
adding a
|
||
|
|
A a
|
||
|
|
A a
|
||
|
|
? b
|
||
|
|
A a
|
||
|
|
A b
|
||
|
|
% should fail
|
||
|
|
b already tracked!
|
||
|
|
A a
|
||
|
|
A b
|
||
|
|
% should fail
|
||
|
|
a already tracked!
|
||
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
||
|
|
warning: conflicts during merge.
|
||
|
|
merging a
|
||
|
|
merging a failed!
|
||
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
||
|
|
There are unresolved merges, you can redo the full merge using:
|
||
|
|
hg update -C 2
|
||
|
|
hg merge 1
|
||
|
|
M a
|
||
|
|
% should fail
|
||
|
|
a already tracked!
|
||
|
|
M a
|
||
|
|
% issue683
|
||
|
|
R a
|
||
|
|
M a
|