mergetools / vimdiff2on commit Merge branch 'js/fopen-harder' into maint (da07df3)
   1. "$MERGE_TOOLS_DIR/vimdiff"