RebaseDlg: Improved error handling on conflict handling
treeee53b1eb8f675930f5d24eb6dcad8da507b7b6b5
-rw-r--r-- 512 .gitignore
-rw-r--r-- 543 .gitmodules
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