From 2f302d640b45dbc0776a6797a06226bc2cb67417 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 28 Feb 2013 13:01:15 +0200 Subject: [PATCH] Git: Make handleMergeConflicts public Change-Id: Id33f3ff4b79242e6e86ff51a1699fe41df022bf9 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 58adc7d77b1..72932eba1a1 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -259,6 +259,7 @@ public: QProcessEnvironment processEnvironment() const; bool isValidRevision(const QString &revision) const; + void handleMergeConflicts(const QString &workingDir, const QString &commit, const QString &abortCommand); static QString msgNoChangedFiles(); @@ -324,7 +325,6 @@ private: void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd); bool executeAndHandleConflicts(const QString &workingDirectory, const QStringList &arguments, const QString &abortCommand = QString()); - void handleMergeConflicts(const QString &workingDir, const QString &commit, const QString &abortCommand); bool tryLauchingGitK(const QProcessEnvironment &env, const QString &workingDirectory, const QString &fileName,