Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 1504:0fcdd126642d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix file opening for some commands on Windows Using file as opener in debug commands won't work on Windows, as the index and data files needs to be opened in binary mode.
author Christian Boos <cboos@neuf.fr>
date Thu, 03 Nov 2005 14:24:07 -0800
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