does anybody know of a good file/directory compare/merge app that allows you to mark blocks of code or entire files as temporarily ignored? i have some project directories that i need to compare to a "clean" install directory. but my projects each have some customized code that i would like to not have to reconsider unless necessary each time i merge the updates from the clean install to the existing project directories

[Edited on October 22, 2006 at 11:29 PM. Reason : if that makes sense]

10/22/2006 11:28:58 PM