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

Git: Introduce MergeTool support

Browse Source 
Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2012-11-05 21:17:49 +02:00
committed by Orgad Shaneh
parent 438e4af735
commit cf6298ff32
10 changed files with 368 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,6 +92,7 @@ public:
void diffBranch(const QString &workingDirectory,
const QStringList &diffArgs,
const QString &branchName);
void merge(const QString &workingDirectory, const QStringList &unmergedFileNames = QStringList());
void status(const QString &workingDirectory);
void graphLog(const QString &workingDirectory) { graphLog(workingDirectory, QString()); }