kmx git

tests/resources/merge-recursive/.gitted/objects/06

Author	Commit	Date	CI	Message
	3b674660	2018-07-01T13:46:59		apply tests: ensure we can patch a modified file Patch application need not be on an unmodified file; applying to an already changed file is supported provided the patch still applies cleanly. Add tests that modifies the contents of a file then applies the patch and ensures that the patch applies cleanly, and the original changes are also kept.
	fccad82e	2015-10-27T14:23:35		merge: add recursive test with three merge bases