Inline added text When inline diffs are shown, added text is shown in this color. Empty Where lines have been added in the opposite pane, and no such line existed in this pane. Conflict resolved Where the same line has been changed in both files, and you have now selected which version should be used. Conflicted Where the same line has been changed in both files. If color code in-line changes is not enabled, this color will not be used and changed lines will always be shown as replacements. Changed portions will be shown using the inline added and deleted colors described below. This color is used for the unchanged portion of the line content. Modified Lines which have relatively small changes, and are shown using inline diff. Normal All lines which are unchanged, or where changes are hidden. The default value is -1, which means context lines number is controlled by git or ntext config. This can be useful with apps such as Visual Basic, which changes case in variables without warning.Ĭontext lines for patches specifies how many context lines for patch files generated from TortoiseGitMerge. Ignore case changes hides changes which are due solely to case changes within the text. Ignore line endings hides changes which are due solely to difference in line-end style. Because of that only lines that are shorter than 3000 chars are shown with inline diffs. Max line length for inline diffs TortoiseGitMerge can get slow when showing inline diffs for very long lines. See EditorConfig website for more details. Currently, it supports indent_style(space/tab) and indent_size properties. Default is unset.ĮditorConfig when set, it will detect. Smart tab char when set, pressing tab key inserts tab/spaces based on adjacent lines/characters. Use spaces when set, pressing tab key inserts spaces. When unset, traditional toolbar interface is used. Use ribbons when set, ribbons interface is used (looks like Office 2007). Most of the options here are self-explanatory, but a few points need clarifying.īackup original file renames the original file in the WC to filename.bak before saving the modified version.ĭefault to UTF-8 encoding when set, ANSI files are loaded as UTF-8 encoded and saved as such when edited.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |