Allow merges which aren't fast-forward