98d023
Fix the tests for the addition of disable_non_fast-forward_merges Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr></pingou@pingoured.fr>