Mercurial > hg > pyhgsh
view tests/test-merge1.out @ 2007:2ffa36dc3423
show committer's name on gitweb's summary page (issue 137)
author | TK Soh <teekaysoh@yahoo.com> |
---|---|
date | Sun, 26 Mar 2006 07:28:52 -0800 |
parents | 2da2d46862fb |
children | b2ae81a7df29 |
line wrap: on
line source
%% no merges expected %% merge should fail abort: 'b' already exists in the working dir and differs from remote %% merge of b expected merging for b merging b %% Contents of b should be "this is file b1" This is file b1 %% merge fails abort: outstanding uncommitted changes %% merge expected! merging for b merging b %% merge of b should fail abort: outstanding uncommitted changes %% merge of b expected merging for b merging b