For those who are vim fans, a quick tip on how to run a diff/merge  task:

Open the files with:

To jump between files:

To jump places where differences are found:

These are just the quick basics, there are a ton of other commands listed on Vim’s documentation page.