tests/test-merge1.out
author mason@suse.com
Tue, 13 Sep 2005 19:33:10 -0500
changeset 1239 29f17e083e84
parent 1236 67a28636ea64
child 1581 db10b7114de0
permissions -rw-r--r--
Turn hgit into an extension, and add commands supporting the latest gitk

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