##// END OF EJS Templates
Removed obsolete workaround for error message in tests/test-static-http.
r1935:d32c4425 default
Show More
test-merge1.out
19 lines | 427 B | text/plain | TextLexer
%% 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 uncommited changes
%% merge expected!
merging for b
merging b
%% merge of b should fail
abort: outstanding uncommited changes
%% merge of b expected
merging for b
merging b