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

UI text: edit merge tool message

Browse Source 
Change-Id: I225f4ec11bc365b48b9f18ae993cbd7dd52f1a7c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Leena Miettinen
2013-02-12 16:53:19 +01:00
committed by Orgad Shaneh
parent b2520cccda
commit 6b27295b92
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
arguments << QLatin1String("mergetool") << QLatin1String("-y"); arguments << QLatin1String("mergetool") << QLatin1String("-y");
if (!files.isEmpty()) { if (!files.isEmpty()) {
if (m_gitClient->gitVersion() < 0x010708) { if (m_gitClient->gitVersion() < 0x010708) {
QMessageBox::warning(0, tr("Error"), tr("Files input for mergetool requires git >= 1.7.8")); QMessageBox::warning(0, tr("Error"), tr("File input for the merge tool requires Git 1.7.8, or later."));
return false; return false;
} }
arguments << files; arguments << files;
@@ -283,7 +283,7 @@ void MergeTool::done()
VcsBase::VcsBaseOutputWindow *outputWindow = VcsBase::VcsBaseOutputWindow::instance(); VcsBase::VcsBaseOutputWindow *outputWindow = VcsBase::VcsBaseOutputWindow::instance();
int exitCode = m_process->exitCode(); int exitCode = m_process->exitCode();
if (!exitCode) { if (!exitCode) {
outputWindow->append(tr("Merge tool process finished successully")); outputWindow->append(tr("Merge tool process finished successully."));
QString gitDir = m_gitClient->findGitDirForRepository(m_process->workingDirectory()); QString gitDir = m_gitClient->findGitDirForRepository(m_process->workingDirectory());
if (QFile::exists(gitDir + QLatin1String("/rebase-apply/rebasing"))) { if (QFile::exists(gitDir + QLatin1String("/rebase-apply/rebasing"))) {