More if-then-else=fit-or-vertical fixes#2810

MisterDA wants to merge 5 commits into

ocaml-ppx:mainocaml-ppx/ocamlformat:mainfrom

MisterDA:fix-or-vertical-fixesMisterDA/ocamlformat:fix-or-vertical-fixesCopy head branch name to clipboard