If there are submodule changes in the file list when resolving conflicts while rebasi...
tree88edffb902dfbeed9c71c37d0ddbda36baa061c7
-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