git-merge: fail correctly when we cannot fast forward.