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
..
apply.c	Rename GIT_EMERGECONFLICT to GIT_ECONFLICT	2015-05-29 09:55:09 -04:00
drop.c	Introduce cl_assert_equal_oid	2014-07-01 14:40:16 -04:00
foreach.c	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
save.c	Merge pull request #2913 from ethomson/stash_fixup	2015-03-03 10:08:28 -05:00
stash_helpers.c	Make checkout match diff for untracked/ignored dir	2014-04-22 21:51:54 -07:00
stash_helpers.h	Rename tests-clar to tests	2013-11-14 14:05:52 -08:00
submodules.c	Make submodules externally refcounted	2014-03-25 09:14:48 -07:00