MERGE_MSG « .gitted « mergedrepo « resources « tests - libgit2 - debian 12 backports: mozilla (cargo, rustc)

summary refs log tree commit diff stats

path: root/tests/resources/mergedrepo/.gitted/MERGE_MSG

blob: 7c4d1f5a9bd9e65e46221e719ad1223091dde1cd (plain)

Merge branch 'branch'

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