Sample Input Data

Input data

The inputs used for the Merge samples are HTML files. The first of which is the common ancestor, and the remaining are edits by four different authors:

Filename deltaV2 version identifiers
four-edits.htmlancestor
four-edits-anna.htmlanna
four-edits-ben.htmlben
four-edits-chris.htmlchris
four-edits-david.htmldavid

Sample results

These files show the ConcurrentMerge (n-way) results which are generated for the different 'result type' settings:

FilenameMergeResultType enumeration value
merge-result-deltav2.xmlDELTAV2
merge-result-analyzed.xmlANALYZED_DELTAV2
merge-result-processed.xmlRULE_PROCESSED_DELTAV2
merge-result-simplified-delta.xmlSIMPLIFIED_DELTA
merge-result-simplified-rule-processed-delta.xmlSIMPLIFIED_RULE_PROCESSED_DELTA

These files give show the three-way results which are generated for the different 'result type' and 'format type' settings:

FilenameThreeWayMergeResultType enumeration value ResultFormat enumeration value
result-three-way-oxygen-track-changes.xmlTHREE_WAY_OXYGEN_TRACK_CHANGES-
result-two-way-xml-delta.xmlTWO_WAY_RESULTXML_DELTA
result-two-way-oxygen-track-changes.xmlTWO_WAY_RESULTOXYGEN_TRACK_CHANGES
result-rule-processed-two-way-xml-delta.xmlRULE_PROCESSED_TWO_WAY_RESULTXML_DELTA
result-rule-processed-two-way-oxygen-track-changes.xmlRULE_PROCESSED_TWO_WAY_RESULTOXYGEN_TRACK_CHANGES