--- a/hello.c	Fri Mar 04 12:30:47 2016 +0100
+++ b/hello.c	Wed May 11 13:48:08 2016 +0200
@@ -4,10 +4,10 @@
  */
 
 #include <stdio.h>
-
+// Un commentaire
 int main(int argc, char **argv)
 {
 	printf("once more, hello.\n");
 	printf("hello merged ?");
 	return 0;
-}
\ No newline at end of file
+}