I use beyond compare 2, not free but try the demo and see what you think.