Change Details

**Task** In the prototype, display text lines the following way: [] the order of the columns is `other version, your version` (i.e. older is to the left, newer to the right, just like it is on diff page) [] no changes in the text: As one box that goes over the whole width of the page, greyed out [] conflicting changes: As boxes next to each other, on a per-line basis, with the color code yellow/blue as it exists on the diff page [] For the first version of this feature, we don't differentiate between empty and filled line treatment **Overall mock:** For some reason it is always a mystery, but if you click on it, it resolves itself {F18567406} **Notes** - For implementation we need a config switch that allows switching between classes of currently used TwoColConflict and the new version of TwoColConflict - There is already a class that creates an array of line change comparisons. This could be a good source for creating the view, just keep on the lookout what it does to newlines

**Task** In the prototype, display text lines the following way: [] the order of the columns is `other version, your version` (i.e. older is to the left, newer to the right, just like it is on diff page) [] no changes in the text: As one box that goes over the whole width of the page, greyed out [] conflicting changes: As boxes next to each other, on a per-line basis, with the color code yellow/blue as it exists on the diff page [] For the first version of this feature, we don't differentiate between empty and filled line treatment [] The text in the hint should be updated to T195712 **Overall mock:** For some reason it is always a mystery, but if you click on it, it resolves itself {F18567406} **Notes** - For implementation we need a config switch that allows switching between classes of currently used TwoColConflict and the new version of TwoColConflict - There is already a class that creates an array of line change comparisons. This could be a good source for creating the view, just keep on the lookout what it does to newlines

**Task** In the prototype, display text lines the following way: [] the order of the columns is `other version, your version` (i.e. older is to the left, newer to the right, just like it is on diff page) [] no changes in the text: As one box that goes over the whole width of the page, greyed out [] conflicting changes: As boxes next to each other, on a per-line basis, with the color code yellow/blue as it exists on the diff page [] For the first version of this feature, we don't differentiate between empty and filled line treatment [] The text in the hint should be updated to T195712 **Overall mock:** For some reason it is always a mystery, but if you click on it, it resolves itself {F18567406} **Notes** - For implementation we need a config switch that allows switching between classes of currently used TwoColConflict and the new version of TwoColConflict - There is already a class that creates an array of line change comparisons. This could be a good source for creating the view, just keep on the lookout what it does to newlines