thodg/libgit2

Commit cdb6c1c83dd6f0d30b798a7f62d4f3849a1f11a1

2015-10-26T17:14:28

merge: add a second-level recursive merge