merge-recursive: make "Auto-merging" comment show for other merges
[gitweb.git] / t / t4034 / css /
drwxr-xr-x   parent (dest: t/t4034; base: 05cf21eba29d18eb6cdece25613c6b1b036872d0)
-rw-r--r-- 571 expect
-rw-r--r-- 150 post
-rw-r--r-- 164 pre