Mercurial > hg > pyhgsh

view tests/test-merge1.out @ 2006:ff8b39daa930

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Show reason why an ignore file can't be read and state that it is skipped.
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 25 Mar 2006 10:31:06 +0100
parents 2da2d46862fb
children b2ae81a7df29
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 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