Mercurial > hg

comparison mercurial/scmwindows.py @ 35500:87918218da70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: raise before running mergedriver if using IMM Merge driver scripts run in the working copy, so disable with IMM for now. Differential Revision: https://phab.mercurial-scm.org/D1781
author Phil Cohen <phillco@fb.com>
date Wed, 27 Dec 2017 13:53:21 -0600
parents d74b0cff94a9
children e24802ea8dbd
comparison
equal deleted inserted replaced
35499:b55a142f00c5 35500:87918218da70