Improve automerge message

pull/333/head
Tim Robinson 2016-06-15 17:05:15 +00:00
rodzic c6fe50b115
commit 8e02fc257c
1 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -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)