Fixed issue #2809: TortoiseGitMerge: Block Control Button is always disabled on confl...
tree5bc14f4e25301e29a2ca5fd8e68d1af732e984ac
-rw-r--r-- 458 .gitignore
-rw-r--r-- 878 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 231 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 3974 README.md
-rw-r--r-- 2217 appveyor.yml
-rw-r--r-- 6137 architecture.txt
-rw-r--r-- 2589 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