# HG changeset patch # User Chloe Laisne # Date 1462967288 -7200 # Node ID bb1d25d50d73eb7de888a5935154c35e093371f4 # Parent cb6ae6d3596787cbabfdc249c0eaf4a43184b432 Commentaire diff -r cb6ae6d35967 -r bb1d25d50d73 hello.c --- 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 - +// Un commentaire int main(int argc, char **argv) { printf("once more, hello.\n"); printf("hello merged ?"); return 0; -} \ No newline at end of file +}