6 Commits

Author	SHA1	Message	Date
Edward Thomson	2f1080ea04	conflict tests: use GIT_IDXENTRY_STAGE_SET	2015-05-28 09:44:22 -04:00
Edward Thomson	d67f270e58	index: validate mode of new conflicts	2015-05-28 09:43:57 -04:00
Edward Thomson	ecd60a56eb	conflicts: when adding conflicts, remove staged ... When adding a conflict for some path, remove the staged entry. Otherwise, an illegal index (with both stage 0 and high-stage entries) would result.	2015-05-28 09:43:49 -04:00
Edward Thomson	0cee70ebb7	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
Carlos Martín Nieto	d541170c77	index: rename an entry's id to 'id' ... This was not converted when we converted the rest, so do it now.	2014-01-25 08:15:44 +01:00
Ben Straub	1782038144	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00