git-mediate (hackage): Become a conflict resolution hero
Keywords: development|gpl|program