Fixed issue #2348: Conflicts during rebase appends "conflicts" to commit message
tree3616153b875c16f36c2b923489796b84709a310b
-rw-r--r-- 429 .gitignore
-rw-r--r-- 762 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 255 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 2878 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