reseteando
unstagingFile
file2
trying merge
trying merge from tarea1
Merge branch 'testing' into tarea1

Conflicts:
	unstagingFile.txt
merge 2 from testing