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

Manually aligning lines in TortoiseMerge #81

Open
GoogleCodeExporter opened this issue Sep 22, 2015 · 2 comments
Open

Manually aligning lines in TortoiseMerge #81

GoogleCodeExporter opened this issue Sep 22, 2015 · 2 comments

Comments

@GoogleCodeExporter
Copy link

From the mailing list 
(http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2832
664)

There is a feature which I found in 'diffuse' (http://diffuse.sf.net) and
which would be a nice addition to TSVN. In diffuse, you can select a line in
the left and right file and tell diffuse to align them with each other. This
is useful when the build-in matching of old an new lines simply doesn't work
or doesn't work correctly.

An example where [T]SVN fails to match lines is a change like this:

A A
B D
     B1
C C

Line D was inserted and line B was changed to B1. However, even though B is
much more similar to B1, the change is displayed from B to D and B1 is
considered as newly inserted. Manually telling the diff viewer that B1 is the
equivalent to B would allow displaying a better diff.

Original issue reported on code.google.com by tortoisesvn on 30 Aug 2011 at 5:54

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

1 participant