Fixed bug with change icon not showing when the version in the IDE is different from on disk

package.json

@@ -71,7 +71,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#d8183d84b4",
         "c9.ide.language.codeintel": "#fc867feec4",
-        "c9.ide.collab": "#8c4a6d0137",
+        "c9.ide.collab": "#2d22e02512",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",

plugins/c9.ide.watcher/gui.js

@@ -294,7 +294,7 @@ define(function(require, exports, module) {
         function automerge(tab, data) {
             if (!settings.getBool("user/general/@automerge"))
                 return false;
-                
+            console.log("Automerging old and new contents");
             return merge(tab, data);
         }