summaryrefslogtreecommitdiff
path: root/tests/merge/files.c
Commit message (Expand)AuthorAgeFilesLines
* Collapse whitespace flags into git_merge_file_flags_tJacques Germishuys2015-03-161-2/+2
* Added tests to merge files and branches with whitespace problems and fixesJacques Germishuys2015-03-161-0/+76
* Introduce git_merge_file for consumersEdward Thomson2014-03-201-0/+175