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