Merge: Better autoinit conflict message
[nit.git] / tests / nitcs.skip