Fixed issue #2812: Better indicate conflicts on stash pop and allow to automatically...
treed05c42144e9ef0e1624ad19acccef86affdb54bb
-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