mergetools / vimdiff3on commit Merge branch 'jk/add-e-kill-editor' (29b2041)
   1. "$MERGE_TOOLS_DIR/vimdiff"