--- a/firstCommitJulien.txt Wed Sep 05 11:04:23 2012 +0200+++ b/firstCommitJulien.txt Wed Sep 05 11:36:05 2012 +0200@@ -1,1 +1,3 @@-First test file commited !!\ No newline at end of file+First test file commited !!++This line is a modif to test the merge\ No newline at end of file