Fixed issue #1166: Unreadable error message in TortoiseMerge
treecda6a2648eefaf5ad23e616fe0930a52acb1d298
-rw-r--r-- 367 .gitignore
-rw-r--r-- 543 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3400 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 184 release.txt
drwxr-xr-x - src
drwxr-xr-x - test