mergetools / gvimdiffon commit Merge branch 'es/worktree-add-cleanup' into maint (71ae535)
   1. "$MERGE_TOOLS_DIR/vimdiff"