Mercurial > hg

diff mercurial/simplemerge.py @ 35317:5c25fe7fb1e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: do not update if IMM; instead, set the overlaywctx's parents Differential Revision: https://phab.mercurial-scm.org/D1246
author Phil Cohen <phillco@fb.com>
date Thu, 07 Dec 2017 16:07:06 -0800
parents 6330df9d6393
children 93c4958d987c
line wrap: on
line diff