tests/test-merge1.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 13 Apr 2006 15:10:03 -0700
changeset 2066 a5d072f38a4a
parent 1995 2da2d46862fb
child 2175 b2ae81a7df29
permissions -rw-r--r--
add coverage.py module to tests directory. written by ned batchelder and gareth rees.

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