diff options
| author | Orgad Shaneh <[email protected]> | 2012-11-05 21:17:49 +0200 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2012-11-07 16:12:27 +0100 |
| commit | cf6298ff328d4314eb2d2fba4f9cf1aad4bdaa37 (patch) | |
| tree | 17f08b34c14060ed4a996523e67b30bd6ada5a88 /src/plugins/git/git.pro | |
| parent | 438e4af735afd95119226c576b2af606afa2cf03 (diff) | |
Git: Introduce MergeTool support
Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/git.pro')
| -rw-r--r-- | src/plugins/git/git.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro index fb887a2e55e..873ad6bacd8 100644 --- a/src/plugins/git/git.pro +++ b/src/plugins/git/git.pro @@ -28,7 +28,8 @@ HEADERS += gitplugin.h \ remotemodel.h \ remotedialog.h \ branchadddialog.h \ - resetdialog.h + resetdialog.h \ + mergetool.h SOURCES += gitplugin.cpp \ gitclient.cpp \ @@ -50,7 +51,8 @@ SOURCES += gitplugin.cpp \ remotemodel.cpp \ remotedialog.cpp \ branchadddialog.cpp \ - resetdialog.cpp + resetdialog.cpp \ + mergetool.cpp FORMS += changeselectiondialog.ui \ settingspage.ui \ |