http://git-scm.com/.
Basically, a program that tracks the development history of source code, but can also be used with lots of other stuff. In this case, it's useful as it detects conflicts (when two addons modify the same file, such as Earth.cfg) and helps you fix them. It also stores all...