Mercurial > hg
diff hgext/pager.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 | 7d99bff0f77c |
children | 49f2d5644f04 |