Mercurial > hg
view tests/test-merge1.out @ 1438:c22da894e4cc
zsh completions: new -M, -m arguments for log, etc.
author | Steve Borho <steve@borho.org> |
---|---|
date | Mon, 24 Oct 2005 16:54:07 -0700 |
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