Yann Droneaud <ydroneaud@xxxxxxxxxx> writes: > +test_expect_success 'merges with merge.ff=only and --no-ff-only' ' > + git reset --hard c1 && > + test_tick && > + test_when_finished "git config --unset merge.ff" && > + git config merge.ff only && I see this was copied from existing tests, but we should use "test_config" these days. It would be a good approach to first do a preparatory patch to convert the existing ones to use "test_config" and then to redo this patch using "test_config" on top of it. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html