diff options
| author | Orgad Shaneh <[email protected]> | 2013-06-14 05:58:24 +0300 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2013-06-17 10:44:27 +0200 |
| commit | 7ff6dcabd118895531e4d7b300fef970421681ce (patch) | |
| tree | 38bc3b2e878ded907c2004e74a358158b0be6bd4 /src/plugins/git/gitclient.h | |
| parent | dbb6bcf5b0d6aec301499881a0fde471e5a1f7bb (diff) | |
Git: Handle merge conflicts on stash pop
Change-Id: I41a9173be2feae4ab529fd9b3f2e1e7cc5ae92ff
Reviewed-by: Petar Perisin <[email protected]>
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
| -rw-r--r-- | src/plugins/git/gitclient.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 7eb42ebb179..e6feb43866f 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -309,7 +309,7 @@ public: StashInfo &stashInfo(const QString &workingDirectory); void endStashScope(const QString &workingDirectory); bool isValidRevision(const QString &revision) const; - void handleMergeConflicts(const QString &workingDir, const QString &commit, const QString &abortCommand); + void handleMergeConflicts(const QString &workingDir, const QString &commit, const QStringList &files, const QString &abortCommand); static QString msgNoChangedFiles(); static QString msgNoCommits(bool includeRemote); |