A variation on jellyx.vim better suited to using vimdiff