hgtest

changeset 3:4840449bb256

Merged changes
author Oscar Ciudad <oscar@jacho.net>
date Mon Dec 14 22:26:34 2009 +0100 (2009-12-14)
parents 83a584698d97 109a87415c32
children 1618bbcbcd7e
files hola.txt
line diff
     1.1 --- a/hola.txt	Mon Dec 14 22:21:32 2009 +0100
     1.2 +++ b/hola.txt	Mon Dec 14 22:26:34 2009 +0100
     1.3 @@ -1,3 +1,5 @@
     1.4  Hola
     1.5  
     1.6 -Esto es una prueba
     1.7 \ No newline at end of file
     1.8 +Esto es una prueba
     1.9 +
    1.10 +Más lineas
    1.11 \ No newline at end of file