Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1618:ff339dd21976

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Renamed c, a, d, u to modified, added, removed, unknown for users of changes()
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 12 Jan 2006 13:35:09 +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