cmds: allow --no-ff command-line argument during merge

Add a checkbox to the Merge dialog to support no-fast-forward during
merge