mergetools / vimdiff3on commit Merge branch 'sb/submodule-init' (f2c96ce)
   1. "$MERGE_TOOLS_DIR/vimdiff"