summaryrefslogtreecommitdiff
path: root/tests/resources/mergedrepo/.gitted/MERGE_MSG
blob: 7c4d1f5a9bd9e65e46221e719ad1223091dde1cd (plain)
1
2
3
4
5
Merge branch 'branch'

Conflicts:
	conflicts-one.txt
	conflicts-two.txt