Add gsetting and initial UI for merge file order preference
preferences: Fix UI for VC file order preferences
data/ui/preferences.ui: Fix ordering
vcview: Hook up merge order preference (bgo#699030)