TGitMerge: After saving a conflicted versioned file, ask whether to mark the file...
treec9c730370ccadf8131288e9b4e7f7727f941f8f4
-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