merge-recursive: make "Auto-merging" comment show for other merges
[gitweb.git] / t / t9700 /
drwxr-xr-x   parent (dest: t; base: 05cf21eba29d18eb6cdece25613c6b1b036872d0)
-rwxr-xr-x 5944 test.pl