[Winmerge-support] win 7?
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp