Merge --ff-only support in FormMerge

Adds an option to the merge dialog, allowing the user to select "Only allow a straight line (fast forward) merge.
Option Enum for MergeType added
Tab order for merge dialog fixed.