Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-merge-revert2.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Wed, 26 Apr 2006 22:15:01 -0700
changeset 2137 5fefab118f7e
parent 2029 d436b21b20dc
child 2175 b2ae81a7df29
permissions -rw-r--r--
Fix timezone check. According to http://en.wikipedia.org/wiki/List_of_time_zones timezones go from UTC-12 to UTC+14.

1:f248da0d4c3e
0:9eca13a34789
f248da0d4c3e tip
9eca13a34789
9eca13a34789+
reverting file1
9eca13a34789
f248da0d4c3e tip
merge: warning: conflicts during merge
merging file1
merging file1 failed!
diff -r f248da0d4c3e file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@ added file1
 added file1
 another line of text
+<<<<<<<
+changed file1 different
+=======
 changed file1
+>>>>>>>
M file1
f248da0d4c3e+ tip
reverting file1
f248da0d4c3e tip
f248da0d4c3e tip
f248da0d4c3e tip
mercurial-crew-with-dirclash