comparison setup.py @ 3530:3f056d3a1f70

tests: add more tests related to stabilization of orphaned merge commit This patch more tests related to stabilization of orphaned merge commit. Stabilization of a merge changeset with both the parents is not supported right now and prints a message on how to do that. Maybe we should do that internally as a part of `hg evolve` but I need to think about this.
author Pulkit Goyal <7895pulkit@gmail.com>
date Tue, 13 Mar 2018 19:06:14 +0530
parents efac9aad0963
children 9f2e480ad786
comparison
equal deleted inserted replaced
3529:d90e0faaec80 3530:3f056d3a1f70