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

Line by line comparison feature #510

Closed
pauvt opened this issue Dec 16, 2020 · 2 comments
Closed

Line by line comparison feature #510

pauvt opened this issue Dec 16, 2020 · 2 comments

Comments

@pauvt
Copy link

pauvt commented Dec 16, 2020

It be very useful to be to force winmerge to compare a text file contents line by line, rather than it try and auto align the differences.

In the following example I want to auto-merge the three files but winmerge can't because in some of the files I've added a new line.

image

Am I missing something or is this a bug/improvement?

@sdottaka
Copy link
Member

It's not a bug, but it needs improvement.

You can get the same result with the diff3 command.
kdiff3 (http://kdiff3.sourceforge.net/) seems to do this well.

@sdottaka
Copy link
Member

With the application of the PR #1051, the above example can now be auto-merged without conflicts when the 'Match similar lines' option is enabled.
image

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