Edward Thomson 6249d960ab index: include conflicts in git_index_read_index ... Ensure that we include conflicts when calling `git_index_read_index`, which will remove conflicts in the index that do not exist in the new target, and will add conflicts from the new target.		2016-06-29 18:37:00 -04:00
..
add.c	turn on strict object validation by default	2016-02-28 18:59:43 -05:00
addall.c	win32: ensure hidden files can be staged	2015-08-03 18:33:15 -05:00
bypath.c	tests: use legitimate object ids	2016-02-28 18:54:56 -05:00
cache.c	tests: use legitimate object ids	2016-02-28 18:54:56 -05:00
collision.c	conflict tests: use GIT_IDXENTRY_STAGE_SET	2015-05-28 09:44:22 -04:00
conflicts.c	index: include conflicts in git_index_read_index	2016-06-29 18:37:00 -04:00
conflicts.h	index: include conflicts in git_index_read_index	2016-06-29 18:37:00 -04:00
crlf.c	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
filemodes.c	tests: use legitimate object ids	2016-02-28 18:54:56 -05:00
inmemory.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
names.c	reset: remove reflog message override	2015-03-03 14:40:50 +01:00
nsec.c	tests: nsec: correctly free nsec_path	2016-03-11 09:07:42 +01:00
racy.c	index::racy: force racy entry	2016-03-08 00:47:55 -05:00
read_index.c	index: include conflicts in git_index_read_index	2016-06-29 18:37:00 -04:00
read_tree.c	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
rename.c	Plug some leaks	2015-09-27 23:32:20 +02:00
reuc.c	reset: remove reflog message override	2015-03-03 14:40:50 +01:00
stage.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
tests.c	git_futils_mkdir_*: make a relative-to-base mkdir	2015-09-17 10:00:35 -04:00