I'm submitting my package vdiff.el to be added to ELPA. This is the first time I've added to ELPA, so please let me know if I missed (or can improve) something. A while back, Stefan asked me to do this, but I got sidetracked with work and forgot about it. Sorry Stefan.
vdiff is a diff tool for Emacs that is made to behave like vimdiff, meaning diff
information is displayed in buffers as you edit them. There are commands for
cycling through the hunks detected by =diff= and applying changes from one
buffer to the other. The main features are
1. Synchronized scrolling of the buffers with lines matching between the two
2. Commands to transmit (send/receive) hunks between buffers
3. Automatic folding of lines that are unchanged in both buffers
4. Commands to jump easily between hunks
5. Everything done through overlays, meaning vdiff doesn't alter the actual
text in the buffer (unless you are transmit changes of course)
6. Unlike ediff, remain in buffers instead of having to use a third "control
7. Hydra from abo_abo's package to simplify navigation and moving changes.
I tried to follow the ELPA readme and pushed it as a subtree to the branch scratch/add-vdiff.