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

diff -r a770b1bc730a -r ac50df1688a7 testDiane.txt
--- a/testDiane.txt	Wed Aug 25 11:20:31 2010 +0200
+++ b/testDiane.txt	Wed Aug 25 11:26:50 2010 +0200
@@ -1,2 +1,4 @@
 Hello World, this is Diane.
-This file is the first i'm adding.
\ No newline at end of file
+This file is the first i'm adding.
+
+blablabla
\ No newline at end of file