Fixed issue #3014: MergeDlg: Commit dialog is opened instead of resovle dialog after...
treed106894039b59e122ec05373bab5123b1a7ade2c
-rw-r--r-- 600 .gitignore
-rw-r--r-- 975 .gitmodules
-rw-r--r-- 639 .mailmap
-rw-r--r-- 231 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 3975 README.md
-rw-r--r-- 2230 appveyor.yml
-rw-r--r-- 6137 architecture.txt
-rw-r--r-- 3463 build.txt
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 1261 release.txt
drwxr-xr-x - src
drwxr-xr-x - test