From f2d17762beea96d6895e508af1ccd1af6558aa4a Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Mon, 19 Oct 2015 14:35:56 -0700
Subject: [PATCH] Added merge tool plugin

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 51ab32d1..9b027a8f 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#e00549cb0f",
-        "c9.ide.scm": "#38d2b48b31",
+        "c9.ide.scm": "#7b44918058",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
         "c9.ide.test": "#d312a01ac6",
         "c9.ide.test.mocha": "#79ff886c04",