8 ms·Mergiraf: A Syntax-Aware Git Merge Driver for Various Languages and Formats5 points by birdculture 17d agoyannoninator 17d agoDoes anyone use this? Looks very interesting.