diff options
Diffstat (limited to 'src/plugins/git/gitsubmiteditor.h')
| -rw-r--r-- | src/plugins/git/gitsubmiteditor.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/git/gitsubmiteditor.h b/src/plugins/git/gitsubmiteditor.h index 41454ac37e..2cacaecc2e 100644 --- a/src/plugins/git/gitsubmiteditor.h +++ b/src/plugins/git/gitsubmiteditor.h @@ -56,6 +56,7 @@ public: signals: void diff(const QStringList &unstagedFiles, const QStringList &stagedFiles); + void merge(const QStringList &unmergedFiles); protected: QByteArray fileContents() const; |