libgit2/libgit2 — pull request #1111 by ethomson (2012-11-29 04:51:09+00:00)
Title: status should ignore conflicts entries in the index

The index iterator should ignore conflict entries (ie, entries with stage > 0). Without this, users eg status will get multiple iterator entries for index entries with a higher stage. Suggest we simply skip higher non-zero stage entries in the index iterator.