I use VS Code soft-wrapping, and `git diff --word-diff` does all I need, though there probably are better methods.