mergetools / gvimdiff3on commit Merge branch 'jc/worktree-config' into maint (fdb70b1)
   1. "$MERGE_TOOLS_DIR/vimdiff"