Git: Introduce MergeTool support

Change-Id: I906c3c692d9f4819bdf2a1489c42ae04f292894d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-05 21:17:49 +02:00
parent 438e4af735
commit cf6298ff32
10 changed files with 368 additions and 4 deletions
--- a/src/plugins/git/git.qbs
+++ b/src/plugins/git/git.qbs
@@ -54,6 +54,8 @@ QtcPlugin {
        "gitutils.h",
        "gitversioncontrol.cpp",
        "gitversioncontrol.h",
+        "mergetool.cpp",
+        "mergetool.h",
        "remoteadditiondialog.ui",
        "remotedialog.cpp",
        "remotedialog.h",