Add nice diff macros