Skip to content
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

Jump to bottom

Add some tests showing the unhelpful conflict messages mentionned in #4373 #5270

Merged
merged 2 commits into from
Sep 2, 2022
Merged

Add some tests showing the unhelpful conflict messages mentionned in #4373 #5270

merged 2 commits into from
Sep 2, 2022

Commits on Sep 2, 2022

  1. Add some tests showing the unhelpful conflict messages mentionned in o… 

    …caml#4373
    @kit-ty-kate @rjbou
    kit-ty-kate authored and rjbou committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    3f0f4de View commit details
    Browse the repository at this point in the history

  2. update changes

    @rjbou
    rjbou committed Sep 2, 2022
    Configuration menu
    Copy the full SHA
    5cf7c4b View commit details
    Browse the repository at this point in the history