f1
f1
file
Merge branch 'mybranch' of https://github.com/carlosdemoraes/test into mybranch
f4
f2
f3
f5
f6
Merge branch 'mybranch'

Conflicts:
	file