Fun Fact. FileMerge.app has remained essentially unchanged since it was introduced in NeXTSTEP (I think 3.2 or earlier) in the early 1990s.
As are many other apps. Yet they keep getting redesigned and engulfed by endless feature creep because people gotta work on something.
Put this in your ~/.gitconfig
[merge]
tool = opendiff
then next time you get a merge conflict, just do: `git mergetool`
it will open xcode's FileMerge.app, which is the best mergetool I've ever used.Indeed, I have it on my Turbo NeXTStation (3.2). Was it revised slightly for NeXTSTEP 4.0 (1996) perhaps?