Mercurial > hg

diff hgext/keyword.py @ 24709:69154e0ae384

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
strip: properly clear resolve state with --keep (issue4593) Normal updates automatically clean up the resolve state, but strip --keep does a "manual" update that bypasses the normal machinery. This adds a mergestate reset.
author Matt Mackall <mpm@selenic.com>
date Mon, 13 Apr 2015 07:42:25 -0500
parents 3e8b06097d00
children 4ecbd88cde9a
line wrap: on
line diff