3 ms·
You seems to be on Mac OSX, if that is the case, try out the file merger that comes with XCode, it's pretty awesome for doing both diffs and merges. Screenshot
by diggan 13y ago
You seems to be on Mac OSX, if that is the case, try out the file merger that comes with XCode, it's pretty awesome for doing both diffs and merges.
Screenshots of the software:
http://osxdaily.com/wp-content/uploads/2010/02/FileMerge-file-comparison-mac.png http://osxdaily.com/wp-content/uploads/2010/02/FileMerge-fil...
http://anoved.net/images/filemerge/filemerge.png http://anoved.net/images/filemerge/filemerge.png
http://www.defraine.net/~brunod/fmdiff/filemerge.gif http://www.defraine.net/~brunod/fmdiff/filemerge.gif
- jbrooksuk 13y agoI've always meant to check that out but always forget. Thanks for reminding me about that, I'll take a look now.
- MaxGabriel 13y agoI love that interface in Xcode! Thanks for reminding me about FileMerge for non Xcode projects.