diff hgext/relink.py @ 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 46ba2cdda476
children 4bc983568016
line wrap: on
line diff