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

Fix some typos

Browse Source 
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
This commit is contained in:
Sergio Ahumada
2014-03-04 00:12:11 +01:00
parent 07f7dd9c14
commit c375436847
32 changed files with 42 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitclient.cpp
View File

@@ -3215,7 +3215,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
filesToReset.append(newFile);
}
} else if (state & UnmergedFile && checked) {
QTC_ASSERT(false, continue); // There should not be unmerged files when commiting!
QTC_ASSERT(false, continue); // There should not be unmerged files when committing!
}
if (state == ModifiedFile && checked) {
@@ -3231,7 +3231,7 @@ bool GitClient::addAndCommit(const QString &repositoryDirectory,
} else if (state == CopiedFile && checked) {
QTC_ASSERT(false, continue); // only is noticed after adding a new file to the index
} else if (state == UnmergedFile && checked) {
QTC_ASSERT(false, continue); // There should not be unmerged files when commiting!
QTC_ASSERT(false, continue); // There should not be unmerged files when committing!
}
}