Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 2049:f70952384ae7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make completion for debugindex<tab><tab> show debugindexdot, too. The special handling for commands with names that are substrings of other commands (e.g. with st and strip) wasn't used with debug commands before.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 05 Apr 2006 19:07:50 +0200
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