objects

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

Author	Commit	Date	CI	Message
	3acf44d6	2013-07-17T09:43:32		tests for checkout index with conflicts
	bec65a5e	2013-04-01T22:16:21		merge!