fix merge --ff on branch with only one commit