No need to check for conflicts of we know there aren't any
tree872f84e49a691b7fb2e8f300722aa84e0c39e342
-rw-r--r-- 439 .gitignore
-rw-r--r-- 878 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 231 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 3843 README.md
-rw-r--r-- 1040 appveyor.yml
-rw-r--r-- 6137 architecture.txt
-rw-r--r-- 2615 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