mergetools / vimdiff3on commit Merge branch 'jk/add-e-kill-editor' into maint (8d5ef5a)
   1. "$MERGE_TOOLS_DIR/vimdiff"