Mercurial > evolve
diff tests/test-evolve-obshistory-content-divergent.t @ 4724:77bf84025dd5
metaedit: allow operations on merge commits with some conditions
As with fold (see the previous patch), it's allowed to metaedit a merge commit
or a set of commits including merge commits (with --fold) as long as there are
less than 2 parents of the set not included in the said set.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sat, 13 Jul 2019 18:22:34 +0800 |
parents | 11b775fddda8 |
children | f7afd3a158e3 f16274729530 |