# HG changeset patch
# User Julien Rougeron <julien.rougeron@iri.centrepompidou.fr>
# Date 1346850488 -7200
# Node ID 89098f9e56b59eead2e574d4d7e13ae4767f496a
# Parent  94334f9a3ff3ffa1bdcbd24c77ddc3802b4c7591
test merged

diff -r 94334f9a3ff3 -r 89098f9e56b5 hello.c
--- a/hello.c	Wed Sep 05 15:03:08 2012 +0200
+++ b/hello.c	Wed Sep 05 15:08:08 2012 +0200
@@ -8,5 +8,6 @@
 int main(int argc, char **argv)
 {
 	printf("once more, hello.\n");
+	printf("hello merged ?");
 	return 0;
 }
\ No newline at end of file