magit-manual-merge: correct doc-string

Also correct indendation.
magit-key-mode-popup-merging: add --no-commit
magit-version.el: properly terminate local vars list

Actually this change is in the Makefile which generates this file.
Makefile: add magit-flow.el to ELS