diff mercurial/filemerge.py @ 19518:12843143663d stable

rebase: allow aborting when descendants detected With this, all aborts will succeed in removing the state, rather than leaving the user in 'what do I do now?' limbo.
author Matt Mackall <mpm@selenic.com>
date Thu, 01 Aug 2013 17:54:12 -0500
parents c58b6ab4c26f
children 89b2336e5ccf
line wrap: on
line diff