You can totally set git up to use a custom diff tool!