Mercurial > qqw

changeset 35:f93e79e9d766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
modified
author sheep
date Sun, 07 Mar 2010 09:56:42 +0100
parents c78a6c5f66d6
children 45dd89bc7439
files home.map
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/home.map	Sun Mar 07 09:56:21 2010 +0100
+++ b/home.map	Sun Mar 07 09:56:42 2010 +0100
@@ -10,6 +10,7 @@
 sprite = box.png
 
 [c]
-<<<<<<< local
-ziew = 123=======
-ziew = 12>>>>>>> other
+ziew = 124
+
+
+