tell user if there are conflicts after applying stashREL_1.7.6.0_INTERNAL
tree536d9670459062b0411ebb6d5a892fccd2fe8295
-rw-r--r-- 628 .gitignore
-rw-r--r-- 543 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3425 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 145 release.txt
drwxr-xr-x - src
drwxr-xr-x - test