Use libgit2 for checking for conflicts
tree9572ed2c9f24ccd6685edc9614f373cc55dd044f
-rw-r--r-- 429 .gitignore
-rw-r--r-- 881 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 256 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 714 appveyor.yml
-rw-r--r-- 2439 build.txt
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 952 release.txt
drwxr-xr-x - src
drwxr-xr-x - test