mergetools / gvimdiff2on commit Merge branch 'nd/per-worktree-config' (8c758f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"