In git, you can merge without committing. Merge your patch first, then do:
git diff --word-diff-regex=.
Note the dot after the equals sign.
In git, you can merge without committing. Merge your patch first, then do:
git diff --word-diff-regex=.
Note the dot after the equals sign.