delta/libgit2.git/src/xdiff, branch cmn/programdata-config

merge_file: treat large files as binary

2015-10-05T20:59:46+00:00

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.

xdiff: convert size variables to size_t

2015-10-05T20:59:41+00:00

xdiff: cleanup some warnings

2015-07-10T14:41:56+00:00

xdiff: upgrade to core git 2.4.5

2015-07-07T22:01:49+00:00

Upgrade xdiff to version used in core git 2.4.5 (0df0541).

Corrects an issue where an LF is added at EOF while applying
an unrelated change (ba31180), cleans up some unused code (be89977 and
e5b0662), and provides an improved callback to avoid leaking internal
(to xdiff) structures (467d348).

This also adds some additional functionality that we do not yet take
advantage of, namely the ability to ignore changes whose lines are
all blank (36617af).

Spelling fixes

2014-12-05T03:06:59+00:00

Merge branch 'new-error-handling' into development

2012-05-02T22:59:02+00:00

Conflicts:
	.travis.yml
	include/git2/diff.h
	src/config_file.c
	src/diff.c
	src/diff_output.c
	src/mwindow.c
	src/path.c
	tests-clar/clar_helpers.c
	tests-clar/object/tree/frompath.c
	tests/t00-core.c
	tests/t03-objwrite.c
	tests/t08-tag.c
	tests/t10-refs.c
	tests/t12-repo.c
	tests/t18-status.c
	tests/test_helpers.c
	tests/test_main.c

Check for _WIN32 instead of GIT_WIN32 or WIN32 to detect windows build environments

2012-04-21T16:45:32+00:00

This fixes a possible compilation issue (when GIT_WIN32 was not set) which was introduced in revision 69a4bc1988fc242bd0d310781c865cce5481a0e6.

Signed-off-by: Sven Strickroth

WIN32 is not always defined, use GIT_WIN32 instead

2012-04-20T16:51:10+00:00

Signed-off-by: Sven Strickroth

Fix warnings on 64-bit windows builds

2012-04-17T17:47:39+00:00

This fixes all the warnings on win64 except those in deps, which
come from the regex code.

Update diff to use iterators

2012-03-02T23:49:29+00:00

This is a major reorganization of the diff code.  This changes
the diff functions to use the iterators for traversing the
content.  This allowed a lot of code to be simplified.  Also,
this moved the functions relating to outputting a diff into a
new file (diff_output.c).

This includes a number of other changes - adding utility
functions, extending iterators, etc. plus more tests for the
diff code.  This also takes the example diff.c program much
further in terms of emulating git-diff command line options.