Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge-revert.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 | c9226bcc288d |
children | b2ae81a7df29 |
line wrap: on
line source
1:016807e6fdaf 0:eb43f19ff115 016807e6fdaf tip eb43f19ff115 eb43f19ff115+ reverting file1 ? file1.orig eb43f19ff115 ? file1.orig 016807e6fdaf tip merging file1 ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip ? file1.orig 016807e6fdaf tip