Age | Commit message (Expand) | Author |
---|---|---|
2015-11-25 | merge tests: move expected data into own file | Edward Thomson |
2015-10-05 | diff: don't feed large files to xdiff | Edward Thomson |
2015-10-05 | merge_file: treat large files as binary | Edward Thomson |
2015-07-08 | merge_files: don't add trailing newlines | Edward Thomson |
2015-03-16 | Collapse whitespace flags into git_merge_file_flags_t | Jacques Germishuys |
2015-03-16 | Added tests to merge files and branches with whitespace problems and fixes | Jacques Germishuys |
2014-03-20 | Introduce git_merge_file for consumers | Edward Thomson |