#word-diff

Normally diffs are done line by line. However git diff --word-diff allows word diffing. The inital commit had a misspelling of the word fleece. However a normal git diff makes this change hard to see as it highlights lines that have changed (in this case the whole poem is on one line).

tom@tom-All-Series:~/hacking/git-test$ git diff diff --git a/mary-lamb.md b/mary-lamb.md index e803864..5781cd7 100644 --- a/mary-lamb.md +++ b/mary-lamb.md @@ -1 +1 @@ -Mary had a little lamb. Little lamb. Little lamb. Marry had a little lamb, his flece was white as snow. +Mary had a little lamb. Little lamb. Little lamb. Marry had a little lamb, his fleece was white as snow.

Here is the output using word-diff

tom@tom-All-Series:~/hacking/git-test$ git diff --word-diff diff --git a/mary-lamb.md b/mary-lamb.md index e803864..5781cd7 100644 --- a/mary-lamb.md +++ b/mary-lamb.md @@ -1 +1 @@ Mary had a little lamb. Little lamb. Little lamb. Marry had a little lamb, his [-flece-]{+fleece+} was white as snow.

How to: Highlight the difference between two strings in PHP

Highlight the difference between two strings in PHP

What is the easiest way to highlight the difference between two strings in PHP?

I’m thinking along the lines of the Stack Overflow edit history page, where new text is in green and removed text is in red. If there are any pre-written functions or classes available, that would be ideal.

Answer: Highlight the difference between two strings in PHP