Vdiff — Efficiently Move Differences Between Two Files Using Vim
Vdiff takes two files and opens them using Vim in diff mode. It then provides single-stroke key mappings that makes moving differences between the two files efficient. Specifically, there are keystroke for moving to the next of previous difference, to pull or push a difference, to pull or push all differences, and to save the files and exit or to exit without saving any changes. This makes Vdiff useful for use in scripts that manage the updating of golden files.
You can find the latest version of the source code on Github.