Fixed issue #2578: Resolve Dialog <enter> should open "Edit conflicts"
tree9f76faad4d26ce8d3a617947f8450eb3450ec9fc
-rw-r--r-- 439 .gitignore
-rw-r--r-- 878 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 231 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 3944 README.md
-rw-r--r-- 2074 appveyor.yml
-rw-r--r-- 6137 architecture.txt
-rw-r--r-- 2615 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