test merged
authorJulien Rougeron <julien.rougeron@iri.centrepompidou.fr>
Wed, 05 Sep 2012 15:08:08 +0200
changeset 77 89098f9e56b5
parent 76 94334f9a3ff3
child 79 8c6d2cf28de5
test merged
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