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