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

# this file holds the definitions that are used in various bzr tests

     2

     3

TERM=dumb; export TERM

     4

echo '[extensions]' >> $HGRCPATH

     5

echo 'convert = ' >> $HGRCPATH

     6

     7

glog()

     8

{

     9

    hg log -G --template '{rev}@{branch} "{desc|firstline}" files+: [{file_adds}], files-: [{file_dels}], files: [{file_mods}]\n' "$@"

    10

}

    11

    12

manifest()

    13

{

    14

    echo "% manifest of $2"

    15

    hg -R $1 manifest -v -r $2

    16

}