Question

I need to selectively revert a few lines in a massive file (to be specific, Xcode changed some settings in a project file that I need to revert before committing). I was told there is a tool that will interactively go through the file, diff by diff, and allow you to make changes.

I think it was called svn-view-diffs but I can’t find any reference to it.

How may I accomplish this task?

thanks

Answer 1

Here’s a few choices for ‘merge’ tools, all of which are also used for showing differences between files. Most allow you to edit one file inside the tool, either by editing directly or clicking on differences.