25   <<<<<<< local: 32e80765d7fe - test: "branch2"

    26   something else

    27   =======

    28   something

    29   >>>>>>> other: 75234512624c  - test: "branch1"

    30 

    31   $ hg status

    32   M a

    33   ? a.orig

    34 

    35 Verify custom conflict markers

    36 

    37   $ hg up -q --clean .

    38   $ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc

    39 

    40   $ hg merge 1

    41   merging a

    42   warning: conflicts during merge.

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

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

    45   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

    46   [1]

    47 

    48   $ cat a

    49   <<<<<<< local: test 2

    50   something else

    51   =======

    52   something

    53   >>>>>>> other: test 1

    54 

    55 Verify basic conflict markers

    56 

    57   $ hg up -q --clean .

    58   $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc

    59 

    60   $ hg merge 1

    61   merging a

    62   warning: conflicts during merge.

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

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

    65   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

    66   [1]

    67 

    68   $ cat a