I use WinMerge now. Previously have used WinDiff and KDiff3 in the past. So long as there is good keyboard support for merging and the ability to edit a line on the go, I'll be happy to use it.