kmx git

tests/merge/trees/whitespace.c

Author	Commit	Date	CI	Message
	13de9363	2015-03-12T12:36:09		Collapse whitespace flags into git_merge_file_flags_t
	0f24cac2	2015-03-09T17:03:03		Added tests to merge files and branches with whitespace problems and fixes