]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'es/worktree-repair-copied' into cw/worktrees-relative
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 Oct 2024 18:49:13 +0000 (11:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Oct 2024 18:49:13 +0000 (11:49 -0700)
* es/worktree-repair-copied:
  worktree: repair copied repository and linked worktrees

1  2 
worktree.c

diff --cc worktree.c
Simple merge