tests/test-merge1.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 31 Mar 2006 17:00:09 -0800
changeset 2061 5987c1eac2ce
parent 1995 2da2d46862fb
child 2175 b2ae81a7df29
permissions -rw-r--r--
support nested repositories. mercurial will not recurse into a subdirectory that contains a .hg directory. it is treated as a separate repository.

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