summaryrefslogtreecommitdiff
path: root/src/xdiff/xinclude.h
Commit message (Collapse)AuthorAgeFilesLines
* xdiff: upgrade to git's included xdiffEdward Thomson2018-01-211-2/+3
| | | | | | Upgrade xdiff to git's most recent version, which includes changes to CR/LF handling. Now CR/LF included in the input files will be detected and conflict markers will be emitted with CR/LF when appropriate.
* Check for _WIN32 instead of GIT_WIN32 or WIN32 to detect windows build ↵Sven Strickroth2012-04-211-1/+1
| | | | | | | | environments This fixes a possible compilation issue (when GIT_WIN32 was not set) which was introduced in revision 69a4bc1988fc242bd0d310781c865cce5481a0e6. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* WIN32 is not always defined, use GIT_WIN32 insteadSven Strickroth2012-04-201-1/+1
| | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* Initial implementation of git_diff_blobRussell Belfer2012-03-021-1/+5
| | | | | | | | This gets the basic plumbing in place for git_diff_blob. There is a known issue where additional parameters like the number of lines of context to display on the diff are not working correctly (which leads one of the new unit tests to fail).
* Import xdiff library from gitRussell Belfer2012-03-021-0/+42
This is the initial import of the xdiff code (LGPL) from core git as of rev f349b562086e2b7595d8a977d2734ab2ef9e71ef