Skip to content
Snippets Groups Projects
Commit ad9db007 authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

rebase: fix selection of base used when rebasing merge (issue4041)

Prior this changeset, rebasing a merge whose first parent was not in
the rebase lead to wrong and highly conflicting merge. See the in-line
comment for details.

Test have been updated with the data provided by the reported.
parent 7bec3f69
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment