From 1833b8c330dfefbfe9e8f2b1510b918c13ee4766 Mon Sep 17 00:00:00 2001
From: Tim Robinson <tim@c9.io>
Date: Thu, 10 Sep 2015 16:30:44 +0000
Subject: [PATCH] Allow changing of body text in filechange dialog

---
 plugins/c9.ide.dialog.common/filechange.js | 3 ++-
 plugins/c9.ide.watcher/gui.js              | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/c9.ide.dialog.common/filechange.js b/plugins/c9.ide.dialog.common/filechange.js
index f98e91ce..ac5676db 100644
--- a/plugins/c9.ide.dialog.common/filechange.js
+++ b/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();
diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index f3bf9964..8ea36281 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/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