nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git] / contrib / tinks / res /
drwxr-xr-x   ..
-rw-r--r-- 2 .gitignore