vcview: Hook up merge order preference (bgo#699030)
vcview: Hand off some labelling metadata from VC to file comparisons
data/ui/filediff.ui: Add toolbar items for label widgets
Initial pass at actually setting labels
data/ui/filediff.ui: Pad set labels for appearance purposes
WIP: Port to C++