commit externo 2
commit 2 del branch 5
aaa
Update archivo branch 5.txt
Merge branch 'master' of https://github.com/gfsolis/testRepository into branch-6

Conflicts:
	archivo branch 5.txt
Update archivo branch 3.txt
Merge branch 'master' of https://github.com/gfsolis/testRepository into branch-6