mergetools / gvimdiffon commit Merge branch 'js/early-config' into maint (16f8cd1)
   1. "$MERGE_TOOLS_DIR/vimdiff"