diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-28 18:45:57 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2015-05-28 18:45:57 +0200 |
| commit | ff8d635adbf1208927c7319178d29b0ed973a107 (patch) | |
| tree | 329dd098bfefdadf9115c4fa4cff4beddd67c696 /include/git2/errors.h | |
| parent | fb92b48d541edde845e8cde176152f13592db71b (diff) | |
| parent | 9b3e41f72bd9ab62e8d129713755c3a3a71359bc (diff) | |
| download | libgit2-ff8d635adbf1208927c7319178d29b0ed973a107.tar.gz | |
Merge pull request #3139 from ethomson/diff_conflicts
Include conflicts when diffing
Diffstat (limited to 'include/git2/errors.h')
0 files changed, 0 insertions, 0 deletions