.gitconfig: fix tmerge alias

Starting from v1.8.4, --ff/--no-ff/--ff-only is a tri-state, and
--no-ff-only has gone away (see a54841e).  Update the tmerge alias
accordingly.