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