mergetools / vimdiff3on commit Merge branch 'nd/corrupt-worktrees' into maint (933f294)
   1. "$MERGE_TOOLS_DIR/vimdiff"