nitcc: collect items with conflict (now that there is always a resolution attempt)
[nit.git] / tests / .gitignore
2014-07-24 Jean Privatgitignore: some update