merge & sequencer: turn "Conflicts:" hint into a comment
[gitweb.git] / t / t9602 /
drwxr-xr-x   parent (dest: t; base: 261f315b)
-rw-r--r-- 2288 README
drwxr-xr-x - cvsroot