4 ms·I've been using Sublime Merge for exactly this purpose since around when it was first launched.by pdpi 2y agoI've been using Sublime Merge for exactly this purpose since around when it was first launched.