Blame tests/resources/mergedrepo/.gitted/MERGE_MSG

Packit Service 20376f
Merge branch 'branch'
Packit Service 20376f
Packit Service 20376f
Conflicts:
Packit Service 20376f
	conflicts-one.txt
Packit Service 20376f
	conflicts-two.txt