Sync TortoiseMerge/MainFrm.cpp from TortoiseSVN revision 24088
treeaba848c7f349a1c26e3b546b7fc66d9ca68cd630
-rw-r--r-- 512 .gitignore
-rw-r--r-- 444 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 196 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 2173 build.txt
drwxr-xr-x - common
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