mergetools / vimdiff2on commit Merge branch 'sb/submodule-path-misc-bugs' into sb/submodule-init (ee30f17)
   1. "$MERGE_TOOLS_DIR/vimdiff"