From 1feee3bff0136faa0cebf75d54c5aa50e50b7e11 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Mon, 19 Oct 2015 17:20:18 -0700
Subject: [PATCH] Tweaks to the merge tool

---
 configs/client-default.js          | 1 +
 package.json                       | 2 +-
 plugins/c9.ide.editors/document.js | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/configs/client-default.js b/configs/client-default.js
index c71e359d..a3dbe949 100644
--- a/configs/client-default.js
+++ b/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) {
diff --git a/package.json b/package.json
index 9b027a8f..c0a63e67 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": "#7b44918058",
+        "c9.ide.scm": "#62011267ea",
         "c9.ide.terminal.monitor": "#b76f1c9f24",
         "c9.ide.test": "#d312a01ac6",
         "c9.ide.test.mocha": "#79ff886c04",
diff --git a/plugins/c9.ide.editors/document.js b/plugins/c9.ide.editors/document.js
index 6c7174c5..e8b8f33d 100644
--- a/plugins/c9.ide.editors/document.js
+++ b/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;
                 }