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

Git: Suggest mergetool on stash restore conflicts

Browse Source 
Removed warning popup, but stderr is still visible in Version Control pane

Change-Id: I6f5779f0382b8ead1e7140eb6ad533ea0c91dcc2
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2013-11-05 20:47:10 +02:00
committed by Orgad Shaneh
parent d7b8b291a9
commit 647c65c96e
3 changed files with 10 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitclient.h
View File

@@ -197,8 +197,7 @@ public:
bool synchronousStashRestore(const QString &workingDirectory,
const QString &stash,
bool pop = false,
const QString &branch = QString(),
QString *errorMessage = 0);
const QString &branch = QString());
bool synchronousStashRemove(const QString &workingDirectory,
const QString &stash = QString(),
QString *errorMessage = 0);