file2.txt
commit lez
commit LEZ
branche LHA
commit lez
com
Merge branch 'master' into LHA
merge branch 'master' into lez

Conflicts:
	TestLez.txt