Mercurial > hg

comparison mercurial/merge.py @ 20327:46c2331fc750 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
author Matt Mackall <mpm@selenic.com>
date Thu, 30 Jan 2014 13:56:56 -0600
parents 95b9c6149e17
children e4d7cbc94219
comparison
equal deleted inserted replaced
20326:82cbaf025b98 20327:46c2331fc750