cherry-pick/revert: add scissors line on merge conflict
[gitweb.git] / t / t9602 /
drwxr-xr-x   parent (dest: t; base: 1a2b985fb375e7ce14932bfc59365024af2fb6ab)
-rw-r--r-- 2288 README
drwxr-xr-x - cvsroot