[stable-3.10] Display correct conflict part in multiple conflicts resolution dialog. #6045
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![backportbot-nextcloud[bot]](https://avatars.githubusercontent.com/in/21012?s=60&v=4){kind=small}
Signed-off-by: alex-z <blackslayer4@gmail.com>
|
AppImage file: nextcloud-PR-6045-13fccdf84b5796f77b5790bab06d3f3b00c8d4a2-x86_64.AppImage |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## stable-3.10 #6045 +/- ##
===============================================
- Coverage 60.32% 60.14% -0.19%
===============================================
Files 145 145
Lines 18872 18872
===============================================
- Hits 11385 11351 -34
- Misses 7487 7521 +34 |
|
Kudos, SonarCloud Quality Gate passed! |
mgallien
approved these changes
Sep 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #6043