Any recommended tools, which can do in-place (for in-place, I mean some IDE or tools which could have functions of both compare and merge.) compare for two files, and merge them in-place?
I currently use the diff command line, but am looking for a GUI tool.
Free tool is appreciated. :)