This option ensures only that related blocks of changed and unchanged text remain aligned. This setting can be especially useful in conjunction with the Intelligently split blocks of changed text based on matched line pairs option. Add vertical padding to align changesĬheck this option to add padding below text blocks as required to keep all related changes vertically aligned. Show number of omitted unchanged linesĬheck this option to display a count of lines that have been hidden in a collapsed block of unchanged lines. The adjacent entry field can be used to specify how many lines should be shown at the top and bottom of the collapsed section to provide some context for the collapsed lines. Show context around changes of only # linesĬheck this option to collapse sections of unchanged lines. Break lines at word boundariesĬheck this option to wrap text at word boundaries instead of at the character nearest the edge. Wrap long linesĬheck this option to have Merge use multiple lines on the screen to display a long line of text. Use the colour selection button to change the background colour of highlighted matches. Uncheck this option if the highlighting of matching text is not desired. Highlight text matching the current word/selection with background colourĬheck this option to indicate other visible occurrences of the current word or selection. Show whitespace charactersĬheck this option to show whitespace characters in text comparisons. This is purely a visual option, and does not affect the line endings used when files are saved (you can choose those in the Save dialog). When this option is checked, Merge will show the Carriage Return and/or Line Ending characters at the end of each line. Indicate where changes are concealed at line endsĬheck this option to have Merge display an indicator at the end of each line that contains changes located off the right-hand edge of the visible portion of the line. When this option is checked, Merge will display line numbers and byte offsets at the left of each file panel. The controls on this page are used to configure the behaviour and appearance of file comparison windows.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |