# HG changeset patch
# User Julien Rougeron <julien.rougeron@iri.centrepompidou.fr>
# Date 1346850877 -7200
# Node ID 8c6d2cf28de5165d29899850dc527f21129aa0b2
# Parent  69778189f54de237ff1ee04fac7098111e28ba93# Parent  89098f9e56b59eead2e574d4d7e13ae4767f496a
test

diff -r 69778189f54d -r 8c6d2cf28de5 hello.c
--- a/hello.c	Wed Sep 05 15:12:11 2012 +0200
+++ b/hello.c	Wed Sep 05 15:14:37 2012 +0200
@@ -1,7 +1,13 @@
-test
+/*
+ * Placed in the public domain by Bryan O'Sullivan.  This program is
+ * not covered by patents in the United States or other countries.
+ */
 
-to merged
+#include <stdio.h>
 
-
-
-fdsvlkdw
\ No newline at end of file
+int main(int argc, char **argv)
+{
+	printf("once more, hello.\n");
+	printf("hello merged ?");
+	return 0;
+}
\ No newline at end of file
diff -r 69778189f54d -r 8c6d2cf28de5 helloW.txt
--- a/helloW.txt	Wed Sep 05 15:12:11 2012 +0200
+++ b/helloW.txt	Wed Sep 05 15:14:37 2012 +0200
@@ -10,5 +10,5 @@
 								Ahoy
 encore un Bonjour TT le monde.. nic.
 Hello World by Diane
-Hello by Julien
+Hello by 54 Julien
 Ni hao shijie….
\ No newline at end of file