Changes between Version 1 and Version 2 of Ticket #12730
- Timestamp:
- Mar 15, 2017, 9:35:48 PM (7 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
Ticket #12730 – Description
v1 v2 1 1 On 1.2-stable we see: 2 2 3 [[Image(Screen Shot 2017-03-15 at 11.34.17.png,100% )]]3 [[Image(Screen Shot 2017-03-15 at 11.34.17.png,100%,border=3)]] 4 4 5 On trunk the //revert// links are no longer displayed .5 On trunk the //revert// links are no longer displayed: 6 6 7 [[Image(Screen Shot 2017-03-15 at 11.37.36.png,100% )]]7 [[Image(Screen Shot 2017-03-15 at 11.37.36.png,100%,border=3)]] 8 8 9 Also, for both 1.2-stable and trunk, those property changes be highlighted as "conflicts". Here is what we see on 1.0-stable:9 For both 1.2-stable and trunk, the property changes should be highlighted as //conflicts//. Here is what we see on 1.0-stable: 10 10 11 [[Image(Screen Shot 2017-03-15 at 11.37.12.png,100% )]]11 [[Image(Screen Shot 2017-03-15 at 11.37.12.png,100%,border=3)]]