comparison mercurial/ancestor.py @ 34033:d37f1bb68169

filemerge: move a util copy call to filectx.write This way a future in-memory-merge context can intercept them. Differential Revision: https://phab.mercurial-scm.org/D400
author Phil Cohen <phillco@fb.com>
date Thu, 31 Aug 2017 11:28:59 -0700
parents bd872f64a8ba
children f8b46245b26a
comparison
equal deleted inserted replaced
34032:67cfffbfb6a0 34033:d37f1bb68169