kopia lustrzana https://github.com/c9/core
Tweaks to the merge tool
rodzic
f2d17762be
commit
1feee3bff0
|
@ -712,6 +712,7 @@ module.exports = function(options) {
|
||||||
"plugins/c9.ide.scm/log",
|
"plugins/c9.ide.scm/log",
|
||||||
"plugins/c9.ide.scm/git",
|
"plugins/c9.ide.scm/git",
|
||||||
"plugins/c9.ide.scm/editor",
|
"plugins/c9.ide.scm/editor",
|
||||||
|
"plugins/c9.ide.scm/mergetool",
|
||||||
];
|
];
|
||||||
|
|
||||||
if (!options.sdk) {
|
if (!options.sdk) {
|
||||||
|
|
|
@ -106,7 +106,7 @@
|
||||||
"c9.ide.run.build": "#0598fff697",
|
"c9.ide.run.build": "#0598fff697",
|
||||||
"c9.ide.run.debug.xdebug": "#61dcbd0180",
|
"c9.ide.run.debug.xdebug": "#61dcbd0180",
|
||||||
"c9.ide.save": "#e00549cb0f",
|
"c9.ide.save": "#e00549cb0f",
|
||||||
"c9.ide.scm": "#7b44918058",
|
"c9.ide.scm": "#62011267ea",
|
||||||
"c9.ide.terminal.monitor": "#b76f1c9f24",
|
"c9.ide.terminal.monitor": "#b76f1c9f24",
|
||||||
"c9.ide.test": "#d312a01ac6",
|
"c9.ide.test": "#d312a01ac6",
|
||||||
"c9.ide.test.mocha": "#79ff886c04",
|
"c9.ide.test.mocha": "#79ff886c04",
|
||||||
|
|
|
@ -55,6 +55,7 @@ define(function(require, module, exports) {
|
||||||
|
|
||||||
function setBookmarkedValue(value, cleansed) {
|
function setBookmarkedValue(value, cleansed) {
|
||||||
if (plugin.value == value) {
|
if (plugin.value == value) {
|
||||||
|
recentValue = value;
|
||||||
undoManager.bookmark();
|
undoManager.bookmark();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue