I also recomment diff-so-fancy (https://github.com/so-fancy/diff-so-fancy) to clean up the regular diffs a bit. :)