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
..
git2	Rename GIT_EMERGECONFLICT to GIT_ECONFLICT	2015-05-29 09:55:09 -04:00
git2.h	Remove the callbacks struct from the remote	2015-05-13 09:46:35 +02:00