git should have color.ui = true.  Thanks, hrldcpr!
Adding git-meld.  Thanks, @wmanley!