| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge tests: move expected data into own file | Edward Thomson | 2015-11-25 | 1 | -0/+1 |
| | | |||||
| * | diff: don't feed large files to xdiff | Edward Thomson | 2015-10-05 | 1 | -3/+3 |
| | | |||||
| * | merge_file: treat large files as binary | Edward Thomson | 2015-10-05 | 1 | -0/+88 |
| | | | | | | | | | xdiff craps the bed on large files. Treat very large files as binary, so that it doesn't even have to try. Refactor our merge binary handling to better match git.git, which looks for a NUL in the first 8000 bytes. | ||||
| * | merge_files: don't add trailing newlines | Edward Thomson | 2015-07-07 | 1 | -0/+39 |
| | | | | | | When invoked with three files that each lack a trailing newline, the merge result should also lack a trailing newline. | ||||
| * | Collapse whitespace flags into git_merge_file_flags_t | Jacques Germishuys | 2015-03-16 | 1 | -2/+2 |
| | | |||||
| * | Added tests to merge files and branches with whitespace problems and fixes | Jacques Germishuys | 2015-03-16 | 1 | -0/+76 |
| | | |||||
| * | Introduce git_merge_file for consumers | Edward Thomson | 2014-03-20 | 1 | -0/+175 |
 |
index : delta/libgit2.git | |
| github.com: libgit2/libgit2.git |
| summaryrefslogtreecommitdiff |