Edward Thomson 9ff89eaaa1 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-28 08:18:37 +02:00
..
trees	introduce git_index_entry_is_conflict	2015-05-28 09:47:31 -04:00
workdir	merge: work around write-side racy protection when hacking the index	2015-06-22 16:11:58 +02:00
files.c	merge_files: don't add trailing newlines	2015-07-28 08:18:37 +02:00
merge_helpers.c	Remove the signature from ref-modifying functions	2015-03-03 14:40:50 +01:00
merge_helpers.h	Factor 40 and 41 constants from source.	2014-09-16 13:07:04 +02:00