- 25 Nov, 2015 1 commit
-
-
Edward Thomson committed
-
- 05 Oct, 2015 2 commits
-
-
Edward Thomson committed
-
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.
Edward Thomson committed
-
- 07 Jul, 2015 1 commit
-
-
When invoked with three files that each lack a trailing newline, the merge result should also lack a trailing newline.
Edward Thomson committed
-
- 16 Mar, 2015 2 commits
-
-
Jacques Germishuys committed
-
Jacques Germishuys committed
-
- 20 Mar, 2014 1 commit
-
-
Edward Thomson committed
-