comparison tests/test-stabilize-result.t @ 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 c4f8a2916e43
children 3c7f98753e37 0d8973818980 7463f5880ce9
comparison
equal deleted inserted replaced
1575:0c8548df67fe 1576:526253198860