5 ms·

You'll probably want a graphical diff tool. I use Araxis Merge, because I've used it for 15 years or so, but I'm sure there lots of other good options. I can s

You'll probably want a graphical diff tool. I use Araxis Merge, because I've used it for 15 years or so, but I'm sure there lots of other good options. I can still remember the day our lead developer (at my previous job) led a mutiny and we switched from Windows to Macs. A great day in my life. ... I'm sure you'll enjoy developing on your Mac.

joejohnson 13y ago
If you use Xcode, it has a visual difftool that is pretty good. I never use anything for git besides cli and Xcode.
- shaggyfrog 13y ago
  That would be FileMerge, which also does folder diffs -- although not as good as Beyond Compare (one of the few apps I miss having from Windows dev).
- digitalmaster 13y ago
  Thanks didnt know xcode had a visual diff tool build it! I'll give that a shot!
sillysaurus 13y ago
git diff | gvim - Autocoloring is enabled by default. Green for newly added lines, red for deleted lines. Ctrl-F/Ctrl-B jumps forwards/backwards by a page. Do other diff tools offer more functionality than this?