# HG changeset patch
# User grandjoncl <louise.grandjonc@gmail.com>
# Date 1346688263 -7200
# Node ID 93894ba027e72ac0deda65743fd467e2c65b2dce
# Parent  106e99607b03cfb322e614e425c2400e4eb5a6d5# Parent  66ec89bc0f2819b64c39832d68e2c2b10d44e620
merge

diff -r 106e99607b03 -r 93894ba027e7 testDiane.txt
--- a/testDiane.txt	Mon Sep 03 17:59:43 2012 +0200
+++ b/testDiane.txt	Mon Sep 03 18:04:23 2012 +0200
@@ -1,4 +1,6 @@
 Hello World, this is Diane.
 This file is the first i'm adding.
 
-blablabla
\ No newline at end of file
+blablabla
+
+another change