-
Notifications
You must be signed in to change notification settings - Fork 393
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
Fix --word-diff / --color-words handling #833
Conversation
97f9da8
to
f522c3d
Compare
ea04b7c
to
b136b59
Compare
f522c3d
to
c70835f
Compare
b136b59
to
ce661e1
Compare
c70835f
to
e7f697c
Compare
e7f697c
to
ffb2804
Compare
@mrjoel this branch fixes For For |
We currently have no way of computing correct line numbers: it seems that we would need to identify wholly added and removed lines from the ANSI color sequences. side-by-side is (I imagine) almost always used with line numbers, and it doesn't make much sense for word-diff anyway.
ffb2804
to
4ac3930
Compare
9b036a3
to
b9e3da2
Compare
b9e3da2
to
270e402
Compare
Fixes #829 WIP
#807 was a pretty bad attempt at handling this correctly: while the colored content from git was emitted raw, in so doing they were not recognized as hunk lines and we lost line numbers and hunk headers.