libgit2/libgit2sharp — pull request #748 by ethomson (2014-06-03 19:57:54+00:00)
Title: Introduce advance conflict data (REUC, renames)

This introduces the ability for clients to query advanced conflict data: namely, the state of renamification that occurred leading to conflicts, and the resolved conflicts.

This includes the test repository from libgit2 that contains the types of rename conflicts that one might see (rename 1->2, rename 2->1, etc, etc).