Visual text file differencing and merging tool

WinMerge