diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-06-10 19:49:18 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-06-11 10:30:55 +0200 |
| commit | 69d0d6cdca6756fec05af609db6d6a14bb43c0e9 (patch) | |
| tree | 45eabce2e608760f2c6fe96bf24add0e25ddc1a9 /src/plugins/git/commitdata.cpp | |
| parent | 5cb29aec0b104179919d14573c7af88610c39e87 (diff) | |
Git: Style fixes
Change-Id: I600e939e99de77e92de1ff068a5ebad98eb736ca
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/commitdata.cpp')
| -rw-r--r-- | src/plugins/git/commitdata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/commitdata.cpp b/src/plugins/git/commitdata.cpp index c7e9097d512..d17cf89d1c8 100644 --- a/src/plugins/git/commitdata.cpp +++ b/src/plugins/git/commitdata.cpp @@ -136,8 +136,8 @@ bool CommitData::checkLine(const QString &stateInfo, const QString &file) if (xState == UnknownFileState || yState == UnknownFileState) return false; - bool isMerge = (xState == UnmergedFile || yState == UnmergedFile || - ((xState == yState) && (xState == AddedFile || xState == DeletedFile))); + bool isMerge = (xState == UnmergedFile || yState == UnmergedFile + || ((xState == yState) && (xState == AddedFile || xState == DeletedFile))); if (isMerge) { if (xState == yState) { if (xState == UnmergedFile) |