kmx git

tests/resources/testrepo/.gitted/objects/ad/edac69457183c8265c8a9614c1c4fed31d1ff3

Author	Commit	Date	CI	Message
	8acc3b16	2015-11-10T15:53:09		tests: add merge-conflict branch for testrepo Add a new branch that causes a merge conflict to `testrepo` so that we are able to test merging in worktrees.