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

3-way compare does not properly align identical lines when resolving conflicts, and show false highlights #1696

Closed
mambax7 opened this issue Jan 29, 2023 · 3 comments

Comments

@mambax7
Copy link

mambax7 commented Jan 29, 2023

I'm using WinMerge to resolve conflicts between various commits on GitHub.
Recently the identical lines don't align, e.g. in this picture, the "Base" and "HEAD" are the same, but they are shown in different lines, and they have false highlights. Is it because of being "multi-line" difference?
image

@sdottaka
Copy link
Member

Disabling the Align similar lines option in the Options dialogue box, as shown below, should give the expected result.
This needs to be improved, but it can be difficult.
image

sdottaka added a commit that referenced this issue Feb 4, 2023
…s when resolving conflicts, and show false highlights
@sdottaka
Copy link
Member

sdottaka commented Feb 4, 2023

This issue has been fixed in commit 6816404.
Thank you for the report.

@sdottaka sdottaka closed this as completed Feb 4, 2023
@sdottaka sdottaka added this to the v2.16.27 milestone Feb 4, 2023
@mambax7
Copy link
Author

mambax7 commented Feb 6, 2023

Thank you so much! That's awesome!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

2 participants