4 Commits

Author	SHA1	Message	Date
Edward Thomson	ae8f7260ec	merge_files: don't add trailing newlines ... When invoked with three files that each lack a trailing newline, the merge result should also lack a trailing newline.	2015-07-07 17:01:48 -05:00
Jacques Germishuys	13de936316	Collapse whitespace flags into git_merge_file_flags_t	2015-03-16 09:53:27 +02:00
Jacques Germishuys	0f24cac2b9	Added tests to merge files and branches with whitespace problems and fixes	2015-03-16 09:53:27 +02:00
Edward Thomson	05d47768ca	Introduce git_merge_file for consumers	2014-03-20 09:25:05 -07:00