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

Word diff highlighting breaks for swapped phrases #321

Closed
mitio opened this issue May 13, 2014 · 4 comments
Closed

Word diff highlighting breaks for swapped phrases #321

mitio opened this issue May 13, 2014 · 4 comments

Comments

@mitio
Copy link

mitio commented May 13, 2014

Here is an example rendering of the word diff which highlights the wrong parts of the sentence:

wrong word diff rendering

GitX version: 0.15.1869 dev (0.15.1869)

@muhqu created a pen demonstrating the issue.

Related to #243

@mitio mitio mentioned this issue May 13, 2014
5 tasks
@muhqu
Copy link

muhqu commented May 14, 2014

@mitio I found a way and updated the pen: http://codepen.io/muhqu/pen/FcmjB

@mitio
Copy link
Author

mitio commented May 14, 2014

Yes, this looks better. It seems though that it detects the spaces as separate changes as well.

Here's how Git returns the word diff: Foo[-Bar-] Baz {+Bar+} Barf Maybe we should try to achieve something similar?

@rowanj rowanj closed this as completed in 8a79bd7 May 15, 2014
rowanj added a commit that referenced this issue May 15, 2014
fixes #321: Word diff highlighting breaks for swapped phrases
@rowanj
Copy link
Owner

rowanj commented May 15, 2014

Merged @muhqu's fix

@mitio
Copy link
Author

mitio commented May 15, 2014

Thanks!

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

No branches or pull requests

3 participants