Merge remote-tracking branch 'origin/master' into init_auto
[nit.git] / tests / test_nitunit4 / sav / test_sav_conflict.res
1 BAD