nothing
agregando file branch1_2
Modificando algo2.txt
Editando algo2.txt para branch2
Merge branch 'branch2'

Conflicts:
	algo2.txt
comiteando con conflicto
Revert "comiteando con conflicto"

This reverts commit 58063722ee0a1f2e420bcd7533a125d6e811a838.