Last modified: 2013-03-06 08:18:55 UTC
When previewing changes to a page, the stored version is shown on the left and your proposed changes on the right. When viewing the diff of an edit, the previous version is shown on the left and the new version on the right. However, the edit conflict page shows the stored version on the *right* and your proposed changes on the *left*. This is backwards compared to the other two cases.
I am not sure if there are any problems with the order in which it is displayed on the edit conflict page, as they are different cases. For me, it looks ok with my version on the left, and the stored version on the right, for the edit conflict pages. I dont think they need to be consistent as previewing changes and viewing the diff, are different cases from an edit conflict.
The current behaviour is correct, if nothing else because the text on the right is what you'd get by submitting, i.e. the new stored text (conflicting with your edit), loaded in the edit area. You have to manually recover your edits from the text at the bottom, so the diff correctly shows the situation and what needs fixing.
