Mercurial > hg

diff mercurial/transaction.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 bbbbd3c30bfc
children aad39713ef35
line wrap: on
line diff