summaryrefslogtreecommitdiff
path: root/tests/merge/files.c
Commit message (Expand)AuthorAgeFilesLines
* fileops: rename to "futils.h" to match function signaturesPatrick Steinhardt2019-07-201-1/+1
* treewide: remove use of C++ style commentsPatrick Steinhardt2018-07-131-1/+1
* merge: test CR/LF conflicts for CR/LF filesethomson/conflicts_crlfEdward Thomson2018-01-211-0/+48
* merge tests: move expected data into own fileEdward Thomson2015-11-251-0/+1
* diff: don't feed large files to xdiffEdward Thomson2015-10-051-3/+3
* merge_file: treat large files as binaryEdward Thomson2015-10-051-0/+88
* merge_files: don't add trailing newlinesEdward Thomson2015-07-071-0/+39
* 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