3 ms·Git lets you define custom "merge drivers."by mbrock 10y agoGit lets you define custom "merge drivers."