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