blabla5.txt.txt 5
un nouvel essai
merged to b6

Conflicts:
	blabla4.txt
Merge branch 'b6'