Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 2112:2b03c6733efa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add "archive" command, like "cvs export" only better. most code in mercurial/archival.py module, for sharing with hgweb.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 21 Apr 2006 15:27:57 -0700
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