Edward Thomson 7c94801400 diff/status: introduce conflicts ... When diffing against an index, return a new `GIT_DELTA_CONFLICTED` delta type for items that are conflicted. For a single file path, only one delta will be produced (despite the fact that there are multiple entries in the index). Index iterators now have the (optional) ability to return conflicts in the index. Prior to this change, they would be omitted, and callers (like diff) would omit conflicted index entries entirely.		2015-05-28 09:44:02 -04:00
..
ignore.c	ignore: clear the error when matching a pattern negation	2015-05-20 21:49:02 +02:00
renames.c	status test: always test the new file path	2015-05-04 07:18:29 -05:00
single.c	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
status_data.h	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
status_helpers.c	Use 'X' for unreadable status.	2014-05-30 16:22:13 -07:00
status_helpers.h	New tests of status for repo inside repo	2014-04-01 21:32:06 -07:00
submodules.c	repository: remove log message override for switching the active branch	2015-03-03 14:40:50 +01:00
worktree_init.c	Fixed a couple Clang warnings	2014-11-10 08:18:48 +09:00
worktree.c	diff/status: introduce conflicts	2015-05-28 09:44:02 -04:00