Tweaks to the merge tool

configs/client-default.js

@@ -712,6 +712,7 @@ module.exports = function(options) {
         "plugins/c9.ide.scm/log",
         "plugins/c9.ide.scm/git",
         "plugins/c9.ide.scm/editor",
+        "plugins/c9.ide.scm/mergetool",
     ];
     
     if (!options.sdk) {

package.json

@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#e00549cb0f",
-        "c9.ide.scm": "#7b44918058",
+        "c9.ide.scm": "#62011267ea",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
         "c9.ide.test": "#d312a01ac6",
         "c9.ide.test.mocha": "#79ff886c04",

plugins/c9.ide.editors/document.js

@@ -55,6 +55,7 @@ define(function(require, module, exports) {
             
             function setBookmarkedValue(value, cleansed) {
                 if (plugin.value == value) {
+                    recentValue = value;
                     undoManager.bookmark();
                     return;
                 }