equal
deleted
inserted
replaced
|
1 |
1 This is the first file commited to the repo |
2 This is the first file commited to the repo |
2 Add another line |
3 Add another line |
3 |
4 |
4 blah blah |
5 blah blah |
5 This is a line added by TC |
6 This is a line added by TC |
|
7 |
|
8 Voici de lourdes modifications pour compliquer le merge |
|
9 |
6 |
10 |
7 Hello world by Santiago |
11 Hello world by Santiago |
8 |
12 |
9 Test 2 |
13 Test 2 |
10 |
14 |
11 Geia sou kosmos |
15 Geia sou kosmos |
12 |
16 |
13 beep beep |
17 beep beep |
|
18 |
|
19 Hello World |
14 |
20 |
15 toto from gautier |
21 toto from gautier |
16 In branch boris - merged |
22 In branch boris - merged |
17 |
23 |
18 Another test sdsad\ |
24 Another test sdsad\ |
21 asdfsa |
27 asdfsa |
22 |
28 |
23 Nouvelle ligne |
29 Nouvelle ligne |
24 |
30 |
25 |
31 |
26 test sur readme by Antho |
32 Moi aussi j'écris à la fin |