mon premier commit de branch
Merge branch 'test-branch-1'

Conflicts:
	test.txt
a third file, commited on a branch
Merge branch 'master' of https://github.com/jeleb/test
Merge branch 'master' into test-branch-1
Merge pull request #1 from jeleb/test-branch-1

Test branch 1