You seems to be on Mac OSX, if that is the case, try out the file merger that co... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

		diggan on Oct 9, 2013 \| parent \| context \| favorite \| on: SublimeGit: Full-featured Git integration for Subl... 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-fil... http://anoved.net/images/filemerge/filemerge.png http://www.defraine.net/~brunod/fmdiff/filemerge.gif

jbrooksuk on Oct 9, 2013 | [–]

I've always meant to check that out but always forget. Thanks for reminding me about that, I'll take a look now.

MaxGabriel on Oct 9, 2013 | [–]

I love that interface in Xcode! Thanks for reminding me about FileMerge for non Xcode projects.

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact