baboon

HomePage: http://baboon-project.org

Author: SeyZ

Download: git://github.com/SeyZ/baboon.git

        Detect source code merge conflicts in realtime. Simply get rid of merge hells.