Fixed issue #486: Resolving conflicts can result in nothing to commit and branch...
tree64e8d286ebde0b040bcb324bf70a453bc6ddce6e
-rw-r--r-- 596 .gitignore
-rw-r--r-- 543 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3425 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 145 release.txt
drwxr-xr-x - src
drwxr-xr-x - test