edittest with no --no-ff merge option