Fixed issue #3700: Resolve the conflicts did not show the merge_head with correct...
[TortoiseGit.git] / doc / 
tree21abc0b2ee505f4d450775b1043520d5ea1bcfba
drwxr-xr-x   ..
drwxr-xr-x - Aspell
-rw-r--r-- 2104 AutolistDoc.txt
-rw-r--r-- 8047 HowToContribute.txt
-rw-r--r-- 1297 Screenshots.txt
-rw-r--r-- 22833 doc.build
-rw-r--r-- 11977 doc.build.include
-rw-r--r-- 785 doc.build.user.linux.templ
-rw-r--r-- 1650 doc.build.user.tmpl
drwxr-xr-x - images
-rw-r--r-- 8088 issuetrackers.txt
drwxr-xr-x - logo
-rw-r--r-- 2761 readme.txt
drwxr-xr-x - source
drwxr-xr-x - xsl