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