mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
20 lines
429 B
Plaintext
20 lines
429 B
Plaintext
%% no merges expected
|
|
%% merge should fail
|
|
abort: 'b' already exists in the working dir and differs from remote
|
|
%% merge of b expected
|
|
merging for b
|
|
merging b
|
|
%%
|
|
Contents of b should be "this is file b1"
|
|
This is file b1
|
|
%% merge fails
|
|
abort: outstanding uncommitted changes
|
|
%% merge expected!
|
|
merging for b
|
|
merging b
|
|
%% merge of b should fail
|
|
abort: outstanding uncommitted changes
|
|
%% merge of b expected
|
|
merging for b
|
|
merging b
|