Mercurial > evolve
diff COPYING @ 1576:526253198860
evolve: handle merge commit with single obsolete parent (issue4389)
This handles evolving merge commits with a single obsolete parent. Merge
commits with two obsolete parents are still unsupported. Note this depends
on a change to merge.graft in core. Older versions of mercurial will not
have this functionality. Also, test-unstable.t will fail with older
versions.
author | Andrew Halberstadt <ahalberstadt@mozilla.com> |
---|---|
date | Thu, 26 Nov 2015 20:38:31 -0500 |
parents | e585303fbc5c |
children | 143c8e4dc22d |