diff options
| author | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-07-28 12:17:31 +0300 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2014-07-28 11:21:44 +0200 |
| commit | 4c7f1c5ea98fead57034826d8fe7064c55ce992f (patch) | |
| tree | 6d941aeac027e6e6a2e80fcca305b91fe568033e /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | 7d3d80a6d5c054a449ac4105c8bd1b1e2d8c66b9 (diff) | |
| download | qt-creator-4c7f1c5ea98fead57034826d8fe7064c55ce992f.tar.gz | |
DiffEditor: Fix newline handling for not the last chunk
Task-number: QTCREATORBUG-12665
Change-Id: I7a54fa5502d3e06c6e1ccd99dec800f80e217333
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 4b99681e88..6c6346998a 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); |