icdiff cheatsheet

icdiff has nice side by side coloring of intra-line changes. Great for prose/cms diffing.

Use with `git` and `bat`

.gitconfig

[difftool "icdiff"]
    cmd = icdiff \"$LOCAL\" \"$REMOTE\"
    path =

diff

git difftool --tool icdiff -y | bat -p

Install (macOS)

brew install icdiff