thodg/libgit2

Commit a200bcf72838488c1550b1709a3f075f722e0244

2015-10-26T17:25:42

merge: add a third-level recursive merge