On Tue, Mar 2, 2021 at 6:11 AM Wolfgang E. Sanyer <wolfgangesan...@gmail.com> wrote: > Git diff has --color-word, doesn't this suggest that it has the capability of > identifying these word-by-word changes?
No, git diff has that feature. That doesn't imply that the default merge driver has that feature. > Is there perhaps a merge option that is being overlooked? At least not one the upstream git developers know about. (I asked)
