# HG changeset patch
# User Julien Rougeron <julien.rougeron@iri.centrepompidou.fr>
# Date 1346838425 -7200
# Node ID 418cd752d4be775234ff549dbf27923bc148d74a
# Parent  7491c5d95bac271cf62ddde21c46a07c5c66f868
"lets test the merge"

diff -r 7491c5d95bac -r 418cd752d4be firstCommitJulien.txt
--- a/firstCommitJulien.txt	Wed Sep 05 11:36:05 2012 +0200
+++ b/firstCommitJulien.txt	Wed Sep 05 11:47:05 2012 +0200
@@ -1,3 +1,3 @@
 First test file commited !!
 
-This line is a modif to test the merge
\ No newline at end of file
+This line is a modif to test the merge --> modif
\ No newline at end of file