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 /tests/diff/diff_helpers.c | |
| 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 'tests/diff/diff_helpers.c')
0 files changed, 0 insertions, 0 deletions