Improve documentation for conflict resolution
[TortoiseGit.git] / ext / 
tree7a882634f93951a8c84c58dbe90742ab57879781
drwxr-xr-x   ..
drwxr-xr-x - CrashServer
drwxr-xr-x - OGDF
drwxr-xr-x - ResizableLib
drwxr-xr-x - TortoiseOverlays
m--------- - apr
m--------- - apr-util
drwxr-xr-x - build
m--------- - editorconfig
drwxr-xr-x - gitdll
drwxr-xr-x - hunspell
m--------- - libgit2
-rw-r--r-- 1489 libgit2-0001-Make-binary-detection-work-similar-to-vanilla-git.patch
m--------- - pcre
drwxr-xr-x - putty
drwxr-xr-x - scintilla
m--------- - spell
m--------- - tgit
drwxr-xr-x - tools
m--------- - zlib