mensaje cambiado en el branch 6 archivo branch 4.txt
Merge branch 'master' of https://github.com/gfsolis/testRepository into branch-6
Merge branch 'master' of https://github.com/gfsolis/testRepository into branch-6
commit del branch 6
commit 2 del branch 5
aaa
Merge branch 'master' of https://github.com/gfsolis/testRepository into branch-6

Conflicts:
	archivo branch 5.txt
Merge branch 'master' of https://github.com/gfsolis/testRepository into branch-6
Merge pull request #6 from gfsolis/branch-6

Branch 6