tests/test-merge1.out
author Andrew Thompson <andrewkt@aktzero.com>
Thu, 20 Apr 2006 16:33:49 +0200
changeset 2104 f1085d34d20d
parent 1995 2da2d46862fb
child 2175 b2ae81a7df29
permissions -rw-r--r--
Add tests/test-committer This checks to see if the EMAIL environment variable is being used for commit.

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