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
$ hg init r1
$ cd r1
$ hg ci --config ui.allowemptycommit=true -m c0
$ hg ci --config ui.allowemptycommit=true -m c1
$ hg ci --config ui.allowemptycommit=true -m c2
$ hg co -q 0
$ hg ci --config ui.allowemptycommit=true -m c3
created new head
$ hg co -q 3
$ hg merge --quiet
$ hg ci --config ui.allowemptycommit=true -m c4
$ hg log -G -T'{desc}'
@ c4
|\
| o c3
| |
o | c2
| |
o | c1
|/
o c0
>>> from mercurial import hg
>>> from mercurial import ui as uimod
>>> repo = hg.repository(uimod.ui())
>>> for anc in repo.changelog.ancestors([4], inclusive=True):
... print(anc)
4
3
2
1
0