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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned lhiginbotham
Oct 6, 2021
Looking at the before and after screenshots, this might also take care of #7723 |
Converting to draft until the pre-req is finalised and merged. |
lhiginbotham
force-pushed
the
lhiginbotham/fix-8211
branch
from
October 9, 2021 14:40
87d90d0
to
b4535d4
Compare
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
lhiginbotham
force-pushed
the
lhiginbotham/fix-8211
branch
from
October 10, 2021 13:15
b4535d4
to
c240899
Compare
RussKie
approved these changes
Oct 10, 2021
mstv
approved these changes
Oct 10, 2021
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thank you
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
Addendum to gitextensions#8809 Addendum to gitextensions#9620
Merged
RussKie
added a commit
that referenced
this pull request
Oct 20, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #8211
Proposed changes
Screenshots
Before
After
Test methodology
Test environment(s)
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.