merge-recursive: make "Auto-merging" comment show for other merges
[gitweb.git] / t / diff-lib /
drwxr-xr-x   parent (dest: t; base: 05cf21eba29d18eb6cdece25613c6b1b036872d0)
-rw-r--r-- 18787 COPYING
-rw-r--r-- 2163 README