Mercurial > hg

diff mercurial/mergeutil.py @ 35702:c0439e11af16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 c1149533676b
children 2372284d9457
line wrap: on
line diff