mergetools / vimdiff2on commit Merge branch 'jk/prune-mtime' into maint (3b65c24)
   1. "$MERGE_TOOLS_DIR/vimdiff"