view tests/test-merge1.out @ 2095:0bf2a9e5eff1

Don't send "Content-Type: none"

mimetypes.guess_type will return (None, None) when it can't detect the
filetype.

%% 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