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

Git: Move some functions from MergeTool to GitClient

Browse Source 
Needed for interactive rebase

Change-Id: I5ba82735f6521087e7d23d8ee3e1beacd10db30a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-02-25 21:41:32 +02:00
committed by Orgad Shaneh
parent 6275308f63
commit 17019955cd
4 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/mergetool.h
View File

@@ -78,8 +78,6 @@ private:
QString stateName(FileState state, const QString &extraInfo);
void chooseAction();
void addButton(QMessageBox *msgBox, const QString &text, char key);
void continuePreviousGitCommand(const QString &msgBoxTitle, QString msgBoxText,
const QString &buttonName, const QString &gitCommand);
MergeToolProcess *m_process;
MergeType m_mergeType;