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

Add a checkbox to the Merge dialog to support no-fast-forward during
merge
Merge pull request #311 from forfolias/master

cmds: allow --no-ff command-line argument during merge

Signed-off-by: David Aguilar <davvid@gmail.com>