Merging files with unison and vimdiff -- update

I've just updated my post from February about merging files with unison and vimdiff -- I figured out how to do so without launching a new terminal emulator. The solution uses screen. See the updated post.