The excellent diff-hl https://github.com/dgutov/diff-hl just landed support for diffing on the fly! It's really useful contextual info when editing.