##// END OF EJS Templates
rebase: don't create merge when continuing rebase interrupted by old hg...
rebase: don't create merge when continuing rebase interrupted by old hg This fixes the bug described and demonstrated in the previous commit. It does so by practically undoing 8082a77cc3a2 (rebase: remove some redundant setting of dirstate parents, 2020-01-10). Differential Revision: https://phab.mercurial-scm.org/D8356
Martin von Zweigbergk -
r45157:e7af56a0 default
Show More
Name Size Modified Last Commit Author
/ rust / hg-cpython / src / dirstate
copymap.rs Loading ...
dirs_multiset.rs Loading ...
dirstate_map.rs Loading ...
non_normal_entries.rs Loading ...
status.rs Loading ...