# HG changeset patch
# User Matthieu Totet
# Date 1258471791 -3600
# Node ID 38e94ff24114fd0290152d61fbd186797d3c91ce
# Parent  2b16937e4107e9aeb1e97a767ab6a1a4eff474ed# Parent  731f61fc4c51ce31f633cbcba9bf2fc9d400cab1
Merge

diff -r 2b16937e4107 -r 38e94ff24114 helloW.txt
--- a/helloW.txt	Tue Nov 17 16:26:10 2009 +0100
+++ b/helloW.txt	Tue Nov 17 16:29:51 2009 +0100
@@ -3,3 +3,4 @@
 	Bonjour le monde by YMH
 		Hello world by Xrqton
 			Hallo Welt Von Totet
+				Hola a todos por Totet