# HG changeset patch
# User Anthony Ly <anthonyly.com@gmail.com>
# Date 1349255680 -7200
# Node ID 4984acb3309b52c87302b0777dbca6ec5aa1058b
# Parent  6d4080795fbb372dc0366e17225336df819154ea# Parent  d4dffac9d65710b6343c8e61ac2e200d6b2f6f79
Merge bonjour bonsoir

diff -r 6d4080795fbb -r 4984acb3309b helloW.txt
--- a/helloW.txt	Wed Oct 03 11:13:07 2012 +0200
+++ b/helloW.txt	Wed Oct 03 11:14:40 2012 +0200
@@ -11,5 +11,7 @@
 encore un Bonjour TT le monde.. nic.
 Hello World by Diane
 Hello by 54 Julien
+Bonsoir
 Ni hao shijie….
-Bonsoir
\ No newline at end of file
+Bonjour !
+