Do not show conflict resolved dialog from TMerge
tree3f0f135c51cf58db82da22777e442d4c1ec1967a
-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