Fixed issue #2759: Swapped THEIRS and MINE in cherry-pick conflict dialogs and contex...
tree42ba92306ff57193cc2cb1db5c703e47fe6949d4
-rw-r--r-- 449 .gitignore
-rw-r--r-- 878 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 231 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 3945 README.md
-rw-r--r-- 2217 appveyor.yml
-rw-r--r-- 6137 architecture.txt
-rw-r--r-- 2596 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