diff options
| author | Russell Belfer <rb@github.com> | 2012-12-03 13:20:39 -0800 |
|---|---|---|
| committer | Russell Belfer <rb@github.com> | 2012-12-03 13:20:39 -0800 |
| commit | 46e4227695dceabfa7d2d4ae19d486969ba6f8df (patch) | |
| tree | 6977dbd65d3b29cc2c8dd2747cc4c457f09079e1 /include/git2/diff.h | |
| parent | 3368c520dcd345cbc404afe9da68f4c8c3035981 (diff) | |
| parent | b2414661332f7fd6a6819395f1505a58f8d75b5e (diff) | |
| download | libgit2-46e4227695dceabfa7d2d4ae19d486969ba6f8df.tar.gz | |
Merge pull request #1111 from ethomson/conflictstatus
status should ignore conflicts entries in the index
Diffstat (limited to 'include/git2/diff.h')
0 files changed, 0 insertions, 0 deletions