55 Verify line splitting of custom conflict marker which causes multiple lines

    56 

    57   $ hg up -q --clean .

    58   $ cat >> .hg/hgrc <<EOF

    59   > [ui]

    60   > mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz

    61   > EOF

    62 

    63   $ hg -q merge 1

    64   warning: conflicts during merge.

    65   merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

    66   [1]

    67 

    68   $ cat a

    69   <<<<<<< local: test 2

    70   something else

    71   =======

    72   something

    73   >>>>>>> other: test 1

    74