Refresh file list if we don't know if conflict was successfully resolved
tree1a8cf486556098ddfdb9fde6d14515e4ed8aec9e
-rw-r--r-- 429 .gitignore
-rw-r--r-- 762 .gitmodules
-rw-r--r-- 224 .mailmap
-rw-r--r-- 255 .tgitconfig
drwxr-xr-x - Languages
-rw-r--r-- 2878 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