Merge branch 'jk/add-e-kill-editor'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"