diff mercurial/discovery.py @ 33905:61b267a99fea

simplemerge: stop reading from, and writing to, files We now use contexts first for everything and also pass them everywhere. Differential Revision: https://phab.mercurial-scm.org/D380
author Phil Cohen <phillco@fb.com>
date Thu, 24 Aug 2017 21:30:37 -0700
parents 4374e88e808c
children bc775b8cc020
line wrap: on
line diff