libgit2/libgit2sharp — pull request #416 by Saaman (2013-04-26 17:53:33+00:00)
Title: Move Repository.Conflicts to Index.Conflicts

Another small refactoring, suggested by @nulltoken and @yorah.

`Repository.Conflicts` is now tagged as obsolete and moved to `Repository.Index.Conflicts`.