diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-10-15 12:22:10 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-10-15 12:22:10 +0200 |
| commit | 8321596a49ee0a2e09d97538aee0882bd684cb2d (patch) | |
| tree | da794f6e75ce68ee4e7e843bff187c85bc57718a /tests/diff/diffiter.c | |
| parent | d5f7aad810b4232da433b94e3ecf658a75bd145c (diff) | |
| parent | 21515f228b739a3ecd2237bafbba50e8d219d8dd (diff) | |
| download | libgit2-8321596a49ee0a2e09d97538aee0882bd684cb2d.tar.gz | |
Merge pull request #3444 from ethomson/add_preserves_conflict_mode
Preserve modes from a conflict in `git_index_insert`
Diffstat (limited to 'tests/diff/diffiter.c')
0 files changed, 0 insertions, 0 deletions