[PATCH] t7600: test merge configuration override

Set the configuration variable 'merge.ff' to either 'only' or 'no' and check that this configuration can be overridden on command line. Additionally, test for currently not tested option '--no-ff-only' Signed-off-by: Yann Droneaud ydrone...@opteya.com --- t/t7600-merge.sh | 26

Re: [PATCH] t7600: test merge configuration override

Yann Droneaud ydrone...@opteya.com 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