diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-14 11:52:48 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:43:49 -0400 |
| commit | ecd60a56ebd6bdc347a486f53da7de0febef58cf (patch) | |
| tree | efea34ffa8b81deab7f186756222035e3ed1f2af /include/git2/index.h | |
| parent | 1b6c26db976596e74ddaf5da8d0f43a63ccee063 (diff) | |
| download | libgit2-ecd60a56ebd6bdc347a486f53da7de0febef58cf.tar.gz | |
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.
Diffstat (limited to 'include/git2/index.h')
| -rw-r--r-- | include/git2/index.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/git2/index.h b/include/git2/index.h index 52032f7fd..1e1d5e748 100644 --- a/include/git2/index.h +++ b/include/git2/index.h @@ -631,7 +631,8 @@ GIT_EXTERN(int) git_index_find(size_t *at_pos, git_index *index, const char *pat /**@{*/ /** - * Add or update index entries to represent a conflict + * Add or update index entries to represent a conflict. Any staged + * entries that exist at the given paths will be removed. * * The entries are the entries from the tree included in the merge. Any * entry may be null to indicate that that file was not present in the |