Simple and easy way to compare old and new files especially working with git merge.
vimdiff file1 file2
vim -d file1 file2
Commands:
]c - next diff
[c - prev diff
do - Diff obtain
dp - Diff put
Prereq : Vim split view 'sp' commands to switch between windows.
Ref: