LAB-linuxserver/core
1
0
Fork 0
mirror of https://github.com/linuxserver/core.git synced 2026-02-20 05:07:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve automerge message

Browse Source
This commit is contained in:
Tim Robinson 2016-06-15 17:05:15 +00:00
parent c6fe50b115
commit 8e02fc257c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/c9.ide.watcher/gui.js
View File

@ -594,9 +594,10 @@ define(function(require, exports, module) {
question.show(
"Always merge?",
"Always merge on file changes?",
"Enabling 'auto merge' makes it very easy to collaborate on "
+ "files with other people, especially when combined with "
+ "'auto save'. This setting can be controlled from the "
"With 'auto merge' enabled, if a file changes "
+ "on disk and you have unsaved changes in the IDE, "
+ "it will automatically attempt to merge your changes with the new file. "
+ "This setting can be controlled from the "
+ "settings panel as well.",
function() { // on yes
if (question.dontAsk)