Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 1365:74cf45f8bc19
Suppress warning in zsh_completion script
author | Mikael Berthe <mikael@lilotux.net> |
---|---|
date | Fri, 30 Sep 2005 11:06:13 -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