mergetools / vimdiff3on commit Merge branch 'jn/eoie-ieot' (cdda0cc)
   1. "$MERGE_TOOLS_DIR/vimdiff"