Mercurial > hg

view tests/test-merge1.out @ 1568:1d7d0c07e8f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make all commands be repo-wide by default - refactor code in commands.py so that: if no pattern is given, the command will be repo-wide else it will work on the working dir - update the doc - fix the tests
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 01 Dec 2005 10:51:45 -0600
parents 67a28636ea64
children db10b7114de0
line wrap: on
line source

%% no merges expected
%% merge of b expected
merging for b
merging b
%%
Contents of b should be "this is file b1"
This is file b1
%% merge expected!
merging for b
merging b
%% merge of b expected
merging for b
merging b