Skip to content

Conversation

gerhardol
Copy link
Member

Proposed changes

Git often emits a separate sequence for the first +/-, merge this with the reminder of the line.
This is a minor performance improvement (probably not possible to detect),
for big files number of textmarkers slow down.

Also set the terminal backcolor to SystemColors.Window if unset (instead of hardcoding to White).

Test methodology

Tests adjusted

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.

Git often emits a separate sequence for the first +/-,
merge this with the reminder of the line.
Copy link
Member

@RussKie RussKie left a comment

Choose a reason for hiding this comment

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

:shipit:

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.

seems to work well

@gerhardol gerhardol merged commit 92dd492 into gitextensions:master Sep 9, 2024
4 checks passed
@gerhardol gerhardol deleted the feature/merge-adjacent-textmarkers branch September 9, 2024 20:17
@RussKie RussKie added this to the 5.1 milestone Nov 6, 2024
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