diff setup.py @ 4723:41885988921e

fold: allow operations on merge commits with some conditions It's possible to fold revision chains that include a single merge commit: just fold everything into the merge commit while saving its other parent (so it continues being a merge commit). It's also possible to fold revisions that include multiple merge commits, on the condition that they merge with not more than 2 external changesets (i.e. a changesets that aren't going to be folded).
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Jul 2019 18:07:03 +0800
parents efac9aad0963
children 9f2e480ad786
line wrap: on
line diff