# HG changeset patch
# User wakimd
# Date 1282728410 -7200
# Node ID ac50df1688a707c221d3f73709dae407de2ffac5
# Parent  e1cc6fbf69d46a19d765a4a7a66026f1c11f448a# Parent  a770b1bc730aabfa23fdac153882ca5572aba4cf
Merge

diff -r e1cc6fbf69d4 -r ac50df1688a7 helloW.txt
--- a/helloW.txt	Wed Aug 25 11:23:49 2010 +0200
+++ b/helloW.txt	Wed Aug 25 11:26:50 2010 +0200
@@ -9,4 +9,5 @@
 							Szia
 								Ahoy
 encore un Bonjour TT le monde.. nic.
-Hello World by Diane
\ No newline at end of file
+Hello World by Diane
+Ni hao shijie...
\ No newline at end of file