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.

Sign up for GitHub

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

Jump to bottom

Wrong merging #420

Closed
DrunkAnalytics opened this issue Aug 28, 2020 · 4 comments
Closed

Wrong merging #420

DrunkAnalytics opened this issue Aug 28, 2020 · 4 comments

Comments

@DrunkAnalytics
Copy link

Hello. Starting from ver. 2.16.4 merging files work wrong on x32 XP SP3. Different files are not different. I tested that issue on ver. 2.16.4, 2.16.6 and 2.16.2. On 2.16.2 problem is absent.
WinMerge.txt
@sdottaka
Copy link
Member

Could you attach a screenshot?

@sdottaka
Copy link
Member

Probably now I can reproduce this problem.
It seems that you specified patience for the Diff algorithm on the Compare/General page of the Options dialog.
I think it works if you change from patience to default.

sdottaka added a commit that referenced this issue Aug 28, 2020
@sdottaka
Fix GitHub issue #420: Wrong merging (minimal/patience/histogram Diff…
ef01a1c 
… algorithm does not work on Windows XP)
@sdottaka
Copy link
Member

I've fixed this issue by commit ef01a1c and released version 2.16.8. https://github.com/WinMerge/winmerge/releases/tag/2.16.8
Thank you for the report.

@DrunkAnalytics
Copy link
Author

Thnx! I tested it on ver. 2.16.8 and now it's good.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
2 participants
@sdottaka @DrunkAnalytics