tests/merge/files.c


Log

Author Commit Date CI Message
Jacques Germishuys 13de9363 2015-03-12T12:36:09 Collapse whitespace flags into git_merge_file_flags_t
Jacques Germishuys 0f24cac2 2015-03-09T17:03:03 Added tests to merge files and branches with whitespace problems and fixes
Edward Thomson 05d47768 2014-03-10T22:30:41 Introduce git_merge_file for consumers