it highlights differences between files, which makes merging and resolving conflicts a bit easier.
I think Ubuntu and some other major Linux distros come with diff, which does the same thing and it's what I use. Its a little harder to use, though, as it outputs the differences in the terminal rather than a GUI.
But that's a good tip, I might have to take a look.
Sent from my Nexus 5
Nexus 5: Personal Paranoid Android nightly build
HTC One: Paranoid Android official beta
Samsung Infuse 4g: Beanstalk
==================================== My personal nightly builds from Paranoid Android source
XDA Developers was founded by developers, for developers. It is now a valuable resource for people who want to make the most of their mobile devices, from customizing the look and feel to adding new functionality. Are you a developer?