diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 4b99681e88d..6c6346998a4 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -775,7 +775,6 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch() QCOMPARE(resultChunkData.leftStartingLineNumber, origChunkData.leftStartingLineNumber); QCOMPARE(resultChunkData.rightStartingLineNumber, origChunkData.rightStartingLineNumber); QCOMPARE(resultChunkData.contextChunk, origChunkData.contextChunk); - QEXPECT_FAIL("2 chunks - first ends with blank line", "QTCREATORBUG-12665", Abort); QCOMPARE(resultChunkData.rows.count(), origChunkData.rows.count()); for (int k = 0; k < origChunkData.rows.count(); k++) { const RowData &origRowData = origChunkData.rows.at(k); diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp index f975462c47e..af787f72ff8 100644 --- a/src/plugins/diffeditor/diffutils.cpp +++ b/src/plugins/diffeditor/diffutils.cpp @@ -604,7 +604,7 @@ static QList readLines(const QString &patch, } else { if (noNewLineInEqual >= 0) { removeNewLineFromLastEqual = true; - } else if (lastChunk) { + } else { if (lastEqual > lastDelete && lastEqual > lastInsert) { removeNewLineFromLastEqual = true; } else if (lastDelete > lastEqual && lastDelete > lastInsert) {