OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Regression Test : Ignore line endings when using diff tool

Browse Source
This commit is contained in:
Magne Sjaastad 2018-03-09 08:32:04 +01:00
parent 7221efa7b5
commit 4c19be91ac
1 changed files with 3 additions and 2 deletions

5
ApplicationCode/Application/Tools/RiaTextFileCompare.cpp
View File

@ -60,8 +60,9 @@ bool RiaTextFileCompare::runComparison(const QString& baseFolder, const QString&
fullFilePath = m_pathToDiffTool + "/" + fullFilePath;
}
// Run compare recursively with '-r'
QString args = "-r -u";
// Command line arguments used when invoking 'diff'
// See https://docs.freebsd.org/info/diff/diff.info.diff_Options.html
QString args = "-r -u --strip-trailing-cr";
QString completeCommand = QString("\"%1\" %2 %3 %4").arg(fullFilePath).arg(baseFolder).arg(generatedFolder).arg(args);