New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[stable-3.10] Display correct conflict part in multiple conflicts resolution dialog. #6045

Merged

mgallien merged 1 commit into stable-3.10 from backport/6043/stable-3.10

Sep 12, 2023

Merged

[stable-3.10] Display correct conflict part in multiple conflicts resolution dialog. #6045

Display correct conflict part in multiple conflicts resolution dialog.

This check has been archived and is scheduled for deletion. Learn more about checks retention

Codecov / codecov/patch succeeded Sep 12, 2023 in 0s

Coverage not affected when comparing d96fd43...13fccdf

View this Pull Request on Codecov

Coverage not affected when comparing d96fd43...13fccdf

View more details on Codecov