Git mergetool is back! \o/