From cf6298ff328d4314eb2d2fba4f9cf1aad4bdaa37 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 5 Nov 2012 21:17:49 +0200 Subject: Git: Introduce MergeTool support Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d Reviewed-by: Tobias Hunger --- src/plugins/git/git.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/plugins/git/git.pro') 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 \ -- cgit v1.2.3