Added an ediff wrapper for git tools