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