Is there a comparing tool able to merge line by line?

Question

Currently I use kdiff with tortoise to compare files before commit.

I'm searching for a tool that compares files and is able to merge (undo) a change like by line.

The best example is when I add a temporary dump while coding and forget about it. When I'm about to commit I use tortoise's compare to see what has changed and note that dump. Currently I must go to the file, find it and delete it. The tool I'm looking for would just let me undo/remove/merge that line alone, from the original repo file to the working copy file.

Answer 1

WinMerge is very powerful tool and can be integrated in Tortoise. For Line by Line Merge I like the integrated merging tool of Total Commander. Downside on Total Commander is the missing Tortoise integration.