Mercurial > qqw

changeset 34:c78a6c5f66d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of edit conflict
author <wiki>
date Sun, 07 Mar 2010 09:56:21 +0100
parents 0223428d7f77 (current diff) 140d99db79c3 (diff)
children f93e79e9d766
files home.map
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/home.map	Sun Mar 07 09:55:53 2010 +0100
+++ b/home.map	Sun Mar 07 09:56:21 2010 +0100
@@ -10,4 +10,6 @@
 sprite = box.png
 
 [c]
-ziew = 12
\ No newline at end of file
+<<<<<<< local
+ziew = 123=======
+ziew = 12>>>>>>> other