feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Support reverting unmerged files

Browse Source 
Change-Id: I8b974cb6ec620b303f9b1918af43e6672460f030
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-04 23:09:54 +02:00
committed by Orgad Shaneh
parent cda1b6d246
commit 4f079fe17e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/commitdata.cpp
View File

@@ -205,7 +205,7 @@ QStringList CommitData::filterFiles(const FileStates &state) const
{ {
QStringList result; QStringList result;
foreach (const StateFilePair &p, files) { foreach (const StateFilePair &p, files) {
if (state == p.first) if (state == (p.first & ~(UnmergedFile | UnmergedUs | UnmergedThem)))
result.append(p.second); result.append(p.second);
} }
return result; return result;