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

Git: Make handleMergeConflicts public

Browse Source 
Change-Id: Id33f3ff4b79242e6e86ff51a1699fe41df022bf9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-02-28 13:01:15 +02:00
committed by Orgad Shaneh
parent 7aed61fa21
commit 2f302d640b
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/gitclient.h
View File

@@ -259,6 +259,7 @@ public:
QProcessEnvironment processEnvironment() const; QProcessEnvironment processEnvironment() const;
bool isValidRevision(const QString &revision) const; bool isValidRevision(const QString &revision) const;
void handleMergeConflicts(const QString &workingDir, const QString &commit, const QString &abortCommand);
static QString msgNoChangedFiles(); static QString msgNoChangedFiles();
@@ -324,7 +325,6 @@ private:
void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd); void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd);
bool executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments, bool executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments,
const QString &abortCommand = QString()); const QString &abortCommand = QString());
void handleMergeConflicts(const QString &workingDir, const QString &commit, const QString &abortCommand);
bool tryLauchingGitK(const QProcessEnvironment &env, bool tryLauchingGitK(const QProcessEnvironment &env,
const QString &workingDirectory, const QString &workingDirectory,
const QString &fileName, const QString &fileName,