mergetools / vimdiff3on commit Merge branch 'js/alias-early-config' into maint (040746c)
   1. "$MERGE_TOOLS_DIR/vimdiff"