Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #8211: Incorrect EOL in diff #9620

Merged
merged 1 commit into from Oct 10, 2021

Conversation

lhiginbotham
Copy link
Contributor

@lhiginbotham lhiginbotham commented Oct 6, 2021

Fixes #8211

Proposed changes

  • update the ICSharpCode.TextEditor submodule to allow EOL differentiation (see the other PR)

Screenshots

Before

image

After

image

Test methodology

Test environment(s)

  • GIT 2.33.0.windows.1
  • Windows NT 10.0.19042.0

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.

@ghost ghost assigned lhiginbotham Oct 6, 2021
@lhiginbotham
Copy link
Contributor Author

@RussKie @gerhardol @mstv

Looking at the before and after screenshots, this might also take care of #7723

@RussKie
Copy link
Member

RussKie commented Oct 8, 2021

Converting to draft until the pre-req is finalised and merged.

@lhiginbotham
Copy link
Contributor Author

Latest force-push updates the submodule to reflect a commit-squash-force-push done in the text editor PR

	- update the ICSharpCode.TextEditor submodule to allow EOL differentiation
@RussKie RussKie marked this pull request as ready for review October 10, 2021 13:16
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.

LGTM. Thank you

@mstv mstv merged commit 50031b5 into gitextensions:master Oct 10, 2021
@ghost ghost added this to the 3.6 milestone Oct 10, 2021
RussKie added a commit to RussKie/gitextensions that referenced this pull request Oct 19, 2021
@RussKie RussKie mentioned this pull request Oct 19, 2021
RussKie added a commit that referenced this pull request Oct 20, 2021
Addendum to #8809
Addendum to #9620
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Incorrect EOL in diff
3 participants