Line filtering doesn't work
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp