mergetools / vimdiff2on commit Merge branch 'js/early-config-with-onbranch' (e46249f)
   1. "$MERGE_TOOLS_DIR/vimdiff"