Refactored: Move conflict resolve code to CAppUtils
[TortoiseGit.git] / doc / source / en / 
tree2d9d9c3086802739b34fdae43945328c4e80613e
drwxr-xr-x   ..
drwxr-xr-x - TortoiseGit
drwxr-xr-x - TortoiseMerge
-rw-r--r-- 233 Version.in
-rw-r--r-- 10398 glossary.xml
-rw-r--r-- 814 wishlist.xml