← 64577528 `but resolve` finds conflicted commits on worktree branches

Passed clippy 49s

raw log