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

  $ rm -rf a

     2

  $ hg init a

     3

  $ cd a

     4

  $ echo a > a

     5

  $ hg ci -Am0

     6

  adding a

     7

  $ hg tag t1 # 1

     8

  $ hg tag --remove t1 # 2

     9

    10

  $ hg co 1

    11

  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

    12

  $ hg tag -f -r0 t1

    13

  $ hg tags

    14

  tip                                3:a49829c4fc11

    15

  t1                                 0:f7b1eb17ad24

    16

    17

  $ cd ..