##// 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.
Pierre-Yves David -
r19969:ad9db007 stable
Show More
Name Size Modified Last Commit Author
/ tests / bundles
darcs1.hg Loading ...
hgweb+obs.hg Loading ...
issue4041.hg Loading ...
legacy-encoding.hg Loading ...
rebase-revset.hg Loading ...
rebase.hg Loading ...
rebase.sh Loading ...
remote.hg Loading ...
remote.sh Loading ...
rename.sh Loading ...
renames.hg Loading ...
tampered.hg Loading ...
test-invalid-branch-name.hg Loading ...
test-keyword.hg Loading ...
test-manifest.hg Loading ...
test-merge-symlinks.hg Loading ...
test-no-symlinks.hg Loading ...