Winmerge (my diff/merge tool of choice) has improved in the latest release (23-Mar-2005) (or maybe I’ve just been slack keeping up with the latest versions). It now has one of those “diff summary view thingos” that WinDiff used to have (see left-hand in the screen-shot below). Also it has a “diff in current line” feature (thank goodness somebody thought to add that feature - altho it seems like their current implementation could use some improvements), as well as better syntax hilighting. 