diff .hgignore @ 34076:cd38b83bfb23

filemerge: use fctx.write() in the internal:dump tool, instead of copy This is slower but allows this tool to work with the "deferred writes" milestone of in-memory merge. The performance hit is not too noticiable since this only used for the :dump merge tool during a conflict. Differential Revision: https://phab.mercurial-scm.org/D617
author Phil Cohen <phillco@fb.com>
date Tue, 05 Sep 2017 12:04:02 -0700
parents 91ae09010950
children bd8875b6473c
line wrap: on
line diff