diff hgext/histedit.py @ 20640:52929dcdd512

merge: handle create+delete prompts in calculateupdates I would like to move it all the way to the interactive resolve state like merges are ... but this is a first intermediate step.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 02 Mar 2014 18:36:02 +0100
parents 5840da876235
children 70d02abff434
line wrap: on
line diff