Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge1.out @ 2137:5fefab118f7e
Fix timezone check.
According to http://en.wikipedia.org/wiki/List_of_time_zones
timezones go from UTC-12 to UTC+14.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Wed, 26 Apr 2006 22:15:01 -0700 |
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