nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git] / misc / syntaxhighlighter /
drwxr-xr-x   ..
-rw-r--r-- 2175 shBrushNit.js