Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1639:dbfc04a55607

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
_hg_status improvements in bash_completion: - Use "hg status -n" option instead of cut command. - Sort status flags accoring to "hg status --help" - Show deleted files instead of "hg remove"d for "hg remove"
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 26 Jan 2006 15:07:46 +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