Mercurial > hg
diff .editorconfig @ 35500:87918218da70
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 | d30fdd6d1bf7 |
children | 1d6066336d7b |