diff mercurial/server.py @ 33908:4074de97b512

simplemerge: simplify code now that we always write to a context There's no need for an `out` abstraction between files and contexts anymore. Differential Revision: https://phab.mercurial-scm.org/D383
author Phil Cohen <phillco@fb.com>
date Thu, 24 Aug 2017 21:30:51 -0700
parents e48cb1c7a902
children bfcd0d227972
line wrap: on
line diff