问题
Sorry, I'm just not finding anything that can do this! For example I get a big fat .diff of 30 files.. sure, I can use patch and apply that to my source baseline. But, I'd hope to be able to take that .diff and my source tree and interactively view those changes to review the diff and optionally merge in or ignore sections.
回答1:
Check out opendiff which is part of Mac OS X Developer Tools (XCode). It won't work exactly how you want (directly on .diff files), but you can make a temp copy of your source tree, apply your diffs, then run opendiff to compare visually. You can then selectively merge and choose which version of each change to include.
回答2:
I use "p4merge" from Perforce. It's commercial software, but this particular piece of the tool suite is free and available here on multiple platforms:
http://www.perforce.com/perforce/downloads/
I think you have to download the whole visual client and then pull the pieces you want from the DMG.
来源：https://stackoverflow.com/questions/6209138/how-to-visually-consume-create-diff-patch-files-in-os-x