diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-04 11:10:39 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-04 11:10:39 -0800 |
| commit | c18a5ec58cd93be0c06e2d94b2f87efca8896969 (patch) | |
| tree | 4d2b277a0bf20cd88726e9382950e339c3f5c7dc /src/diff.c | |
| parent | 702c3bf70e0542d57636897eccb36b88a676a6fd (diff) | |
| parent | bdb2f2422356d2f7d795a946eaf6dbe9d7eee64c (diff) | |
| download | libgit2-c18a5ec58cd93be0c06e2d94b2f87efca8896969.tar.gz | |
Merge pull request #1174 from nulltoken/topic/soft_reset_with_index_conflicts
Prevent soft reset when index contains conflicts
Diffstat (limited to 'src/diff.c')
0 files changed, 0 insertions, 0 deletions