# HG changeset patch
# User Oscar Ciudad <oscar@jacho.net>
# Date 1260825994 -3600
# Node ID 4840449bb256097f793b6158d59ff6a8c28b12cd
# Parent  83a584698d972bdb4a819be45446956565f998fd# Parent  109a87415c32622f70e66b21c987fc86a130d81d
Merged changes

diff -r 83a584698d97 -r 4840449bb256 hola.txt
--- a/hola.txt	Mon Dec 14 22:21:32 2009 +0100
+++ b/hola.txt	Mon Dec 14 22:26:34 2009 +0100
@@ -1,3 +1,5 @@
 Hola
 
-Esto es una prueba
\ No newline at end of file
+Esto es una prueba
+
+Más lineas
\ No newline at end of file