Pierre-Yves David 6652b6ffb3 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.

2013-10-30 19:45:14 +01:00

2.2 KiB

Raw History

View Raw