diff options
| author | Edward Thomson <ethomson@github.com> | 2016-06-15 17:37:37 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@github.com> | 2016-06-25 18:05:44 -0400 |
| commit | cf7206f8d32a46b348c2b48bea47583c9bd9929d (patch) | |
| tree | b814db98ff77d43fb47c55cbdbe09d7be0d32036 /src/blob.c | |
| parent | 45405a74fc7f6684ae83be4c16b76b84986c6113 (diff) | |
| download | libgit2-ethomson/checkout_conflict_respect_index.tar.gz | |
checkout: dirty index should conflict on typechangeethomson/checkout_conflict_respect_index
When the target of a checkout has a typechange of an item, a modified
index entry should cause a conflict even when the workdir has been
reverted to the baseline.
Diffstat (limited to 'src/blob.c')
0 files changed, 0 insertions, 0 deletions