Allow merge base to parent with three selected #10116
Merged
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
Allow parents to the actual merge base be used as the base when selecting three revisions in the grid. Previously, multi revision diff was shown instead.
ghost
assigned 
RussKie
approved these changes
Jul 31, 2022
gerhardol
added a commit
that referenced
this pull request
Jul 31, 2022
Allow parents to the actual merge base be used as the base when selecting three revisions in the grid. Previously, multi revision diff was shown instead.
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.
Proposed changes
Allow parents to the actual merge base be used as the
base when selecting three revisions in the grid.
Previously, multi revision diff was shown instead.
Discussed in #10081 (comment)
Screenshots
Before
Multi revision diff
After
FileStatus diff with range-diff
Test methodology
Manual
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.