![]() Such conflicts will be marked as regular conflicts, but their gutter icon will be changed from '!' to '?'. Sometimes you will need to correct the code manually.Ī group of settings to configure how to automatically resolve some conflicts in three-way merge. This gives you more possible ways to merge changes, but requires Produces more change blocks in such a way that all missing lines are turned into new blockĪnd separated from change block. Makes small spans of unchanged text, with the length lower or equal this value, to be markedĪs part of intraline change if they appear between two other intraline changes. Gets greater than this value, intraline changes are not displayed and line is considered as Ratio, calculated as: (length of changed parts / length of unchanged parts) * 100. For optimal results, please remember about intraline_changes_threshold setting. Set this to true if you want intraline changes to be found using full-text search instead of simple comparison of adjacent lines. When you work with big files with lots of changes and get performance problems, you can switch It is only used to mark intraline changes and does not affect general difference analysis. If you want to make it case-insensitive, set this to true.ĭetermines whether to perform intraline differences analysis within each of the change blocks. ![]() By default Sublimerge's diff algorithm is case-sensitive. So any differences between them will not cause the files to be considered as different.ĭefines how to deal with case differences. By default Sublimerge ignores line endings, This setting is a live setting and can be changed while being in diff view via context menu.ĭefines how to deal with CR/LF line endings differences. While comparing files, so each difference in them causes the files to be considered as different. By default Sublimerge does not ignore whitespaces When VCS-related commands does not work and Sublimerge displays an error message aboutĮncoding problems, you may need to set encoding that is compatible with your system's locale.ĭefines how to deal with whitespace differences. In debug mode Sublimerge prints debugging information into console. option.ĭebug false Turns on/off debug mode. When set to true, all defined Custom Comparisons will be displayed in a separate menuĪfter pressing ++ under Custom Comparison. ![]() custom_comparisons_in_separate_menu false ST restart may be required for this setting to apply. ThisĪpplies to diff view only and does not affect other views. Pauseable names appears in console while entering diff view in debug mode. Some plugins, like GitGutter, must be paused in diff view due to some side effects. Set this to false if you want the list to Makes the items in the list of comparable views to be displayed in a more compact way whereįile name and file path are separated. Will order the list as the views are ordered in window. Orders the list of comparable views by file name similarity. This to false will show all opened views in the list. Limits the list of comparable views only to the ones with the same syntax. To change settings, copy the entries that you want to modify to This file is overwritten each time Sublimerge is upgraded.įile, otherwise they will be overwritten when Sublimerge is upgraded.
0 Comments
Leave a Reply. |