mergetools / gvimdiff2on commit Merge branch 'js/xread-in-full' into maint (be5e850)
   1. "$MERGE_TOOLS_DIR/vimdiff"