Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1967:72f7a335b955

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
still use old variable names when running hooks. dropped by accident. we set HG_FOO (new name) and FOO (old name). plan is to drop old names after 0.9.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 17 Mar 2006 09:48:43 -0800
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