mirror of
https://github.com/facebook/sapling.git
synced 2024-10-16 11:52:02 +03:00
6652b6ffb3
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.
2.2 KiB
2.2 KiB