Mercurial > hg > Game > Cerium

changeset 570:283398350c1e draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix tag
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Thu, 22 Oct 2009 23:59:11 +0900
parents a555a28a20e6
children fd3789d17305
files .hgtags
diffstat 1 files changed, 0 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 22 23:56:35 2009 +0900
+++ b/.hgtags	Thu Oct 22 23:59:11 2009 +0900
@@ -1,14 +1,4 @@
 ce5755f544c1a882c7e28b7c78d8b31a82bd9eda cvs
 18c42658e0e7c44dfd936834465e01797c26198c fullHD_omedetou
 516d5c91d5b4d553844a1ad48ccebbdcd5ebaf20 double-linked-task-list
-<<<<<<< local
-0000000000000000000000000000000000000000 ball_bound
-0000000000000000000000000000000000000000 513
-68d1c088097584e6dd515b11854d4b9eb16b7029 ball_bound
-=======
-085c9284125a2d8f15f9c6f3e44ef8f01e2dcea1 ball_bound
-f5c36e8d5dd23c5a1583b23f70b5b398ede132d5 ball_bound
-f5c36e8d5dd23c5a1583b23f70b5b398ede132d5 -r
-f5c36e8d5dd23c5a1583b23f70b5b398ede132d5 513
->>>>>>> other
 bfbe832660f34afff672408eb66dd445b864d37d examples