Edward Thomson 885b94aac0 Rename GIT_EMERGECONFLICT to GIT_ECONFLICT ... We do not error on "merge conflicts"; on the contrary, merge conflicts are a normal part of merging. We only error on "checkout conflicts", where a change exists in the index or the working directory that would otherwise be overwritten by performing the checkout. This *may* happen during merge (after the production of the new index that we're going to checkout) but it could happen during any checkout.		2015-05-29 09:55:09 -04:00
..
binaryunicode.c	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
checkout_helpers.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
checkout_helpers.h	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
conflict.c	conflict tests: use GIT_IDXENTRY_STAGE_SET	2015-05-28 09:44:22 -04:00
crlf.c	Fix ident replacement to match Git behavior	2015-05-26 19:56:06 +02:00
head.c	git_checkout_opts -> git_checkout_options	2014-03-06 09:44:51 -08:00
icase.c	checkout test: better case-insensitive test on Mac	2015-05-04 07:18:30 -05:00
index.c	conflict tests: use GIT_IDXENTRY_STAGE_SET	2015-05-28 09:44:22 -04:00
nasty.c	win32: further cleanups for 8.3 disabling	2015-02-03 20:01:24 -05:00
tree.c	Rename GIT_EMERGECONFLICT to GIT_ECONFLICT	2015-05-29 09:55:09 -04:00
typechange.c	repository: remove log message override for switching the active branch	2015-03-03 14:40:50 +01:00