diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 15:26:13 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-29 09:55:09 -0400 |
| commit | 885b94aac06f17c55bd6f8df318e0cffb0104efa (patch) | |
| tree | d5e0713a5868f230242db3a614eb08fd11ddbd95 /include/git2/tree.h | |
| parent | ff8d635adbf1208927c7319178d29b0ed973a107 (diff) | |
| download | libgit2-885b94aac06f17c55bd6f8df318e0cffb0104efa.tar.gz | |
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.
Diffstat (limited to 'include/git2/tree.h')
0 files changed, 0 insertions, 0 deletions