From 48a583b173081b87e786201bde7bd0b30401e4fa Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 30 Nov 2015 10:47:30 +0000 Subject: [PATCH] almost integration. Got errors. --- configs/client-default.js | 4 +--- package.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configs/client-default.js b/configs/client-default.js index d635fdd3..9d4b2497 100644 --- a/configs/client-default.js +++ b/configs/client-default.js @@ -815,11 +815,9 @@ module.exports = function(options) { "plugins/c9.ide.scm/scm.branches", "plugins/c9.ide.scm/dialog.localchanges", "plugins/c9.ide.scm/scm.log", - "plugins/c9.ide.scm/scmpanel", - "plugins/c9.ide.scm/detail", - // "plugins/c9.ide.scm/log", "plugins/c9.ide.scm/git", "plugins/c9.ide.scm/diff.split", + "plugins/c9.ide.scm/diff.unified", "plugins/c9.ide.scm/mergetool" // // git integration v1 diff --git a/package.json b/package.json index ebfa4646..4b2fe7a1 100644 --- a/package.json +++ b/package.json @@ -109,7 +109,7 @@ "c9.ide.run.build": "#0598fff697", "c9.ide.run.debug.xdebug": "#9956689819", "c9.ide.save": "#4cda35bfdb", - "c9.ide.scm": "#d9a5988b4f", + "c9.ide.scm": "#94c7a4d70d", "c9.ide.terminal.monitor": "#1a4092ede2", "c9.ide.test": "#102942ae4e", "c9.ide.test.mocha": "#fc053b23d2",