Switching to meld as a diff tool