mergetools / vimdiff2on commit Merge branch 'rs/commit-h-single-parent-cleanup' into maint (02a19e9)
   1. "$MERGE_TOOLS_DIR/vimdiff"