Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1874:a84829140fb1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Inherit config from real parentui and don't use ConfigParser internals. Added comments for the meaning of parentui.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 10 Mar 2006 11:06:45 +0100
parents db10b7114de0
children 2da2d46862fb
line wrap: on
line source

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