diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-18 18:15:17 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:44:18 -0400 |
| commit | 191e97a02b3360820177ed7642116796551ce1f6 (patch) | |
| tree | 2fe934a99dc08468b22344d074d1915e2d69440a /tests/checkout/index.c | |
| parent | b22369efa243022ff42582b559ddb6c6e05af2b1 (diff) | |
| download | libgit2-191e97a02b3360820177ed7642116796551ce1f6.tar.gz | |
diff conflicts: don't include incorrect ID
Since a diff entry only concerns a single entry, zero the information
for the index side of a conflict. (The index entry would otherwise
erroneously include the lowest-stage index entry - generally the
ancestor of a conflict.)
Test that during status, the index side of the conflict is empty.
Diffstat (limited to 'tests/checkout/index.c')
0 files changed, 0 insertions, 0 deletions