mergetools / vimdiff2on commit Merge branch 'js/rerere-forget-protect-against-NUL' into maint (63a4d8d)
   1. "$MERGE_TOOLS_DIR/vimdiff"