thodg/libgit2/tests/merge/files.c

---

tests/merge/files.c

---

Log

Author	Commit	Date	CI	Message
	ae8f7260	2015-07-07T16:59:14		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.
	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
	05d47768	2014-03-10T22:30:41		Introduce git_merge_file for consumers