filemerge: when not keeping premerge, don't write markers to context When premerge is enabled (as it is for non-binary inputs by default) and the markers are not kept, we currently still write it to the output context and then restore the previous content right after. With the refactoring in the previous patch, we can easily avoid that step and instead write the output in the opposite case (i.e. when it's successful or when the markers are supposed to be kept). Differential Revision: https://phab.mercurial-scm.org/D12149

     1

# __init__.py - Startup and module loading logic for Mercurial.

     2

#

     3

# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

from __future__ import absolute_import

     9

    10

# Allow 'from mercurial import demandimport' to keep working.

    11

import hgdemandimport

    12

    13

demandimport = hgdemandimport