comparison tests/test-merge-types.t @ 21519:25d5a9ecbb85

merge: add conflict marker formatter (BC)

Adds a conflict marker formatter that can produce custom conflict marker
descriptions. It can be set via ui.mergemarkertemplate. The old behavior
can be used still by setting ui.mergemarkers=basic.

The default format is similar to:

  {node|short} {tag} {branch} {bookmarks} - {author}: "{desc|firstline}"

And renders as:

  contextblahblah
  <<<<<<< local: c7fdd7ce4652 - durham: "Fix broken stuff in my feature branch"
  line from my changes
  =======
  line from the other changes
  >>>>>>> other: a3e55d7f4d38  master - sid0: "This is a commit to master th...
  morecontextblahblah

21518:8e8049b9bda4

  U d
  U f
  U h
  $ tellmeabout a
  a is a plain file with content:
  <<<<<<< local
  2
  =======
  1
  >>>>>>> other
  $ tellmeabout b
  b is a plain file with content:
  <<<<<<< local
  2
  =======
  1
  >>>>>>> other
  $ tellmeabout c
  c is a plain file with content:
  x
  $ tellmeabout d
  d is a symlink:

  3 files updated, 0 files merged, 0 files removed, 5 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
  [1]
  $ tellmeabout a
  a is a plain file with content:
  <<<<<<< local
  1
  =======
  2
  >>>>>>> other
  $ tellmeabout b
  b is an executable file with content:
  <<<<<<< local
  1
  =======
  2
  >>>>>>> other
  $ tellmeabout c
  c is an executable file with content:
  x
  $ tellmeabout d
  d is an executable file with content:

21519:25d5a9ecbb85

  U d
  U f
  U h
  $ tellmeabout a
  a is a plain file with content:
  <<<<<<< local: 0139c5610547 - test: "2"
  2
  =======
  1
  >>>>>>> other: 97e29675e796  - test: "1"
  $ tellmeabout b
  b is a plain file with content:
  <<<<<<< local: 0139c5610547 - test: "2"
  2
  =======
  1
  >>>>>>> other: 97e29675e796  - test: "1"
  $ tellmeabout c
  c is a plain file with content:
  x
  $ tellmeabout d
  d is a symlink:

  3 files updated, 0 files merged, 0 files removed, 5 files unresolved
  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
  [1]
  $ tellmeabout a
  a is a plain file with content:
  <<<<<<< local: 97e29675e796  - test: "1"
  1
  =======
  2
  >>>>>>> other: 0139c5610547 - test: "2"
  $ tellmeabout b
  b is an executable file with content:
  <<<<<<< local: 97e29675e796  - test: "1"
  1
  =======
  2
  >>>>>>> other: 0139c5610547 - test: "2"
  $ tellmeabout c
  c is an executable file with content:
  x
  $ tellmeabout d
  d is an executable file with content: