Skip to content

Conversation

gerhardol
Copy link
Member

@gerhardol gerhardol commented Nov 10, 2024

Proposed changes

To improve inline marking of not interesting parts

Inline differences dims text that are not changed (and add markers where text were removed/added on a line)
Before only consecutive removed followed by consecutive added lines were compared.

Note: This allows gaps in the lines, but still requires removed followed by added lines, so the following is not handled
To expand on this it could be possible to match all lines within a section, but it could be confusing if matches are too far apart.

image

Screenshots

Before

image

After

image

Test methodology

Tests added

Merge strategy

I agree that the maintainer squash merge this PR (if the commit message is clear).


✒️ I contribute this code under The Developer Certificate of Origin.

To improve inline marking of not interesting parts
Copy link
Member

@mstv mstv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

works well

@gerhardol gerhardol merged commit fdc05ab into gitextensions:master Nov 12, 2024
4 checks passed
@gerhardol gerhardol deleted the feature/mark-inline-gaps branch November 12, 2024 21:18
@mstv mstv added this to the v5.2 milestone Jan 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants