3 ms·Vimdiff does the job for me. Needless to say, to use it effectively you should have some proficiency in vim.by sbmthakur 9y agoVimdiff does the job for me. Needless to say, to use it effectively you should have some proficiency in vim.