Merge "fix bug 41280, show correct content when displaying edit conflicts"

diff --combined includes/EditPage.php
index d2db142,4db697f..d7b658f
--- 1/includes/EditPage.php
--- 2/includes/EditPage.php
+++ b/includes/EditPage.php
@@@ -1476,7 -1476,7 +1476,7 @@@ class EditPage 
                                        wfDebug( __METHOD__ . ": Suppressing edit conflict, successful merge.\n" );
                                } else {
                                        $this->section = '';
-                                       #$this->textbox1 = $text; #redundant, nothing to do here?
+                                       $this->textbox1 = ContentHandler::getContentText( $content );
                                        wfDebug( __METHOD__ . ": Keeping edit conflict, failed merge.\n" );
                                }
                        }
@@@ -2931,7 -2931,11 +2931,7 @@@ HTM
                                # Messages: usercsspreview, userjspreview, sitecsspreview, sitejspreview
                                if( $level && $format ) {
                                        $note = "<div id='mw-{$level}{$format}preview'>" . wfMessage( "{$level}{$format}preview" )->text()  . "</div>";
 -                              } else {
 -                                      $note = wfMessage( 'previewnote' )->text() ;
                                }
 -                      } else {
 -                              $note = wfMessage( 'previewnote' )->text() ;
                        }
  
                        $rt = $content->getRedirectChain();