Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2137:5fefab118f7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 7544700fd931
children b2ae81a7df29
line wrap: on
line source

merge: warning: conflicts during merge
merging a
merging a failed!
e7fe8eb3e180+0d24b7662d3e+ tip
something else
=======
something
M a