Add gnu diff combine option for merge commit
tree8e325aee62cf9b5ca554455e56f0b3cf79672674
-rw-r--r-- 442 .gitignore
-rw-r--r-- 391 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3582 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
drwxr-xr-x - src
drwxr-xr-x - test