Fixed issue #2147: Resolve not dealing correctly with (modify/delete) conflicts
treee045b2793cab5f5501581032bcf5cb0c42c5858b
-rw-r--r-- 429 .gitignore
-rw-r--r-- 560 .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-- 1742 release.txt
drwxr-xr-x - src
drwxr-xr-x - test