Merge branch 'jc/show-merge'
[gitweb.git] / Documentation / technical /
drwxr-xr-x   parent (dest: Documentation; base: 868227b0d1f3a295ea9afe7a3be3a1fbdff62442)
-rw-r--r-- 3934 pack-format.txt
-rw-r--r-- 18237 pack-heuristics.txt
-rw-r--r-- 879 pack-protocol.txt
-rw-r--r-- 4246 trivial-merge.txt