thodg/libgit2

Commit 4662583692e92ea1b0eb06e37ffe9d363740db30

2016-02-07T15:19:43

merge driver: correct indentation