Fixed issue #445: Resolve conflict does not delete temporary files
tree7abc16a4ff6c902fee2a8950fe04c2e17789a80a
-rw-r--r-- 388 .gitignore
-rw-r--r-- 391 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3557 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