tests/test-merge1.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 27 Dec 2005 13:12:53 -0600
changeset 1599 f93fde8f5027
parent 1581 db10b7114de0
child 1995 2da2d46862fb
permissions -rw-r--r--
remove the gpg stuff from hgeditor (superseded by the signing extension) remove the gpg stuff from hgeditor, update the comments to make it clear it can be used to show a diff while commiting

%% 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