Support merge strategies except octopus
tree1a200517ed24ea7aef592f0b23d8100c2a5b27b3
-rw-r--r-- 512 .gitignore
-rw-r--r-- 543 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 2173 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 1742 release.txt
drwxr-xr-x - src
drwxr-xr-x - test