tests/test-merge1.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 17 Feb 2006 08:26:21 -0800
changeset 1736 50de0887bbcd
parent 1581 db10b7114de0
child 1995 2da2d46862fb
permissions -rw-r--r--
add preoutgoing and outgoing hooks. preoutgoing lets prevent pull over http or ssh. outgoing lets notify after pull.

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