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