Pierre-Olivier Latour cb63e7e897 Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge() ... This fixes a bug where if a file was in conflicted state in either diff, it would not always remain in conflicted state in the merged diff.		2015-06-22 21:37:41 -07:00
..
binary.c	Fixed Xcode 6.1 build warnings	2015-06-15 09:55:12 -07:00
blob.c	diff: introduce binary diff callbacks	2015-06-12 09:39:20 -04:00
diff_helpers.c	Fixed Xcode 6.1 build warnings	2015-06-15 09:55:12 -07:00
diff_helpers.h	diff: introduce binary diff callbacks	2015-06-12 09:39:20 -04:00
diffiter.c	Drop git_patch_to_str	2014-01-22 17:51:32 +01:00
drivers.c	git_path_dirload: use git_path_diriter	2015-05-01 12:31:09 -04:00
format_email.c	Use git_diff_get_stats in example/diff + refactor	2014-04-22 12:33:27 -07:00
index.c	diff: introduce binary diff callbacks	2015-06-12 09:39:20 -04:00
iterator.c	iterator: submodules are determined by an index or tree	2014-11-07 08:33:27 +01:00
notify.c	diff: introduce binary diff callbacks	2015-06-12 09:39:20 -04:00
patch.c	patch: emit binary patches (optionally)	2014-04-22 19:08:21 -05:00
pathspec.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
racy.c	diff: add failing test for racy-git in the index	2015-06-16 08:40:45 +02:00
rename.c	diff: introduce binary diff callbacks	2015-06-12 09:39:20 -04:00
stats.c	Don't scale diff stat when not needed	2014-05-12 10:28:45 -07:00
submodules.c	diff: introduce binary diff callbacks	2015-06-12 09:39:20 -04:00
tree.c	diff: introduce binary diff callbacks	2015-06-12 09:39:20 -04:00
workdir.c	Explicitly handle GIT_DELTA_CONFLICTED in git_diff_merge()	2015-06-22 21:37:41 -07:00