vimdiff

 vimdiff animals/cat.py animals/dog.py

navigate form one change to another ]c + [c]

do or :diffget (do stands for diff obtain) will move the change to the active window

dp or :diffput (stands for diff put ) will push the change from the active window