Allow changing of body text in filechange dialog

plugins/c9.ide.dialog.common/filechange.js

@@ -28,10 +28,11 @@ define(function(require, module, exports) {
         
         /***** Methods *****/
         
-        function show(title, header, onlocal, onremote, onmerge, options) {
+        function show(title, header, body, onlocal, onremote, onmerge, options) {
             return plugin.queue(function(){
                 plugin.title = title;
                 plugin.heading = util.escapeXml(header);
+                if (body) plugin.body = util.escapeXml(body);
                 
                 var cb = plugin.getElement("applyall");
                 cb.uncheck();

plugins/c9.ide.watcher/gui.js

@@ -394,6 +394,7 @@ define(function(require, exports, module) {
                 changeDialog = filechange.show(
                     "File Changed",
                     path + " has been changed on disk.",
+                    null,
                     no,
                     yes,
                     function(all) { // Merge