##// END OF EJS Templates
rebase: fix selection of base used when rebasing merge (issue4041)...
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.

File last commit:

r14116:cd303243 default
r19969:ad9db007 stable
Show More
tampered.hg
0 lines | 1.1 KiB | application/octet-stream | TextLexer
/ tests / bundles / tampered.hg
Binary file (application/octet-stream)