Fix three-way-merge to be field-sensitive with --vsd-structs every-field#8805

tautschnig wants to merge 1 commit intodiffblue:developdiffblue/cbmc:developfrom

tautschnig:fix-6272-three-way-merge-field-sensitivetautschnig/cbmc:fix-6272-three-way-merge-field-sensitiveCopy head branch name to clipboard