tests/test-merge1.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 09 Feb 2006 07:01:23 +0100
changeset 1706 20b621154e17
parent 1581 db10b7114de0
child 1995 2da2d46862fb
permissions -rw-r--r--
Run commit message editor in the repo root (like hooks). This makes the hgeditor script work with hg commit -R path/to/repo

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