Visual text file differencing and merging tool for PC

WinMerge