Mercurial > hg

diff hgext/rebase.py @ 20640:52929dcdd512

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9155257e6330
children efbf15979538
line wrap: on
line diff