Fixed issue #2568: Add Fast Forward Only option to the merge dialog (--ff-only)

Closed username-removed-217046 requested to merge hpavlov/tortoisegit:issue_2568 into master