# HG changeset patch
# User Julien Rougeron <julien.rougeron@iri.centrepompidou.fr>
# Date 1346850731 -7200
# Node ID 69778189f54de237ff1ee04fac7098111e28ba93
# Parent  7a44ecaf837c3af51215cdff72d910583be254c3
test

diff -r 7a44ecaf837c -r 69778189f54d hello.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/hello.c	Wed Sep 05 15:12:11 2012 +0200
@@ -0,0 +1,7 @@
+test
+
+to merged
+
+
+
+fdsvlkdw
\ No newline at end of file