AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the fossil settings to determine whether gdiff or diff should be used for diffing files

Browse Source 
FossilOrigin-Name: b3dc68271fb2d6fbbe80060d3ec3d206f5f0097f
This commit is contained in:
Kostas
2015-08-14 11:09:22 +00:00
parent 0dcea2a332
commit adaee79179
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/MainWindow.cpp
View File

@@ -1400,8 +1400,9 @@ void MainWindow::getSelectionRemotes(QStringList &remoteUrls)
//------------------------------------------------------------------------------
bool MainWindow::diffFile(const QString &repoFile)
{
if(fossil().diffFile(repoFile, true))
return true;
const QString &gdiff = settings.GetFossilValue(FOSSIL_SETTING_GDIFF_CMD).toString();
if(!gdiff.isEmpty())
return fossil().diffFile(repoFile, true);
else
return fossil().diffFile(repoFile, false);
}