Fixed Issue #486: Resolving conflicts can result in nothing to commit
treeeb4a7f9305934c53c5bf685b81457314ff28788b
-rw-r--r-- 388 .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