kmx git

tests/resources/merge-resolve/.gitted/objects/23

Author	Commit	Date	CI	Message
	6b92c99b	2014-01-19T01:20:25		Don't try to merge binary files
	17820381	2013-11-14T14:05:52		Rename tests-clar to tests