Edward Thomson 191e97a02b diff conflicts: don't include incorrect ID ... Since a diff entry only concerns a single entry, zero the information for the index side of a conflict. (The index entry would otherwise erroneously include the lowest-stage index entry - generally the ancestor of a conflict.) Test that during status, the index side of the conflict is empty.		2015-05-28 09:44:18 -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 conflicts: don't include incorrect ID	2015-05-28 09:44:18 -04:00