Junio C Hamano wrote: > The second release candidate Git v2.31.0-rc2 will be tagged tomorrow. Is https://lore.kernel.org/git/YEbdj27CmjNKSWf4@xxxxxxxxxx/ being considered for -rc3? If not, I think we should revert sh/mergetool-hideresolved. It's the kind of change that can undermine users' trust in "git mergetool", so it's important to me that we don't ship it enabled by default. Thanks, Jonathan
