mergetools / gvimdiff2on commit Merge branch 'js/misc-fixes' into maint (ace5348)
   1. "$MERGE_TOOLS_DIR/vimdiff"