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

Fixed issue where conflicted files could not be reverted

Browse Source 
FossilOrigin-Name: 48ee3014e8868c79f7b8639a9110a24e5743d184
This commit is contained in:
kostas
2014-08-26 12:30:14 +00:00
parent 08a822e0cd
commit aec85389f1
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/MainWindow.cpp
View File

@ -1931,7 +1931,7 @@ void MainWindow::on_actionDelete_triggered()
void MainWindow::on_actionRevert_triggered()
{
QStringList modified_files;
getSelectionFilenames(modified_files, RepoFile::TYPE_EDITTED|RepoFile::TYPE_DELETED|RepoFile::TYPE_MISSING);
getSelectionFilenames(modified_files, RepoFile::TYPE_EDITTED|RepoFile::TYPE_DELETED|RepoFile::TYPE_MISSING|RepoFile::TYPE_CONFLICTED);
if(modified_files.empty())
return;