diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2015-02-04 23:09:54 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2015-02-09 20:58:16 +0000 |
| commit | 4f079fe17e9d56875baaa950279fd50958652b46 (patch) | |
| tree | a5e38af89e343d9d23d1df38b4a1424deae7ff29 /src/plugins/git/commitdata.cpp | |
| parent | cda1b6d2468e4816e7bc285b467c329e0b766b0a (diff) | |
Git: Support reverting unmerged files
Change-Id: I8b974cb6ec620b303f9b1918af43e6672460f030
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/git/commitdata.cpp')
| -rw-r--r-- | src/plugins/git/commitdata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp index 1fb54b9e867..fb0570cfbc8 100644 --- a/src/plugins/git/commitdata.cpp +++ b/src/plugins/git/commitdata.cpp @@ -205,7 +205,7 @@ QStringList CommitData::filterFiles(const FileStates &state) const { QStringList result; foreach (const StateFilePair &p, files) { - if (state == p.first) + if (state == (p.first & ~(UnmergedFile | UnmergedUs | UnmergedThem))) result.append(p.second); } return result; |