comparison mercurial/merge.py @ 35702:c0439e11af16

filemerge: fix backing up an in-memory file to a custom location If the user specifies a ui.origbackuppath, we used to always copy the file there, but if the source file is in memory we must write it instead of copying. Differential Revision: https://phab.mercurial-scm.org/D1806
author Phil Cohen <phillco@fb.com>
date Thu, 04 Jan 2018 21:36:58 -0800
parents 87918218da70
children 45b678bf3a78
comparison
equal deleted inserted replaced
35701:c5d220a621e7 35702:c0439e11af16