For branch1.txt
For branch 2
editado for branch1.txt
Merge branch 'branch1_2' into branch1
Merge branch 'master' into branch1