Merge branch 'se/doc-checkout-ours-theirs'
[gitweb.git] / t / diff-lib /
drwxr-xr-x   parent (dest: t; base: c0b901eaf71ca700eb6c8711af0c848df2d011c5)
-rw-r--r-- 18787 COPYING
-rw-r--r-- 2163 README