Mercurial > hg
view mercurial/help/common.txt @ 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
author | Durham Goode <durham@fb.com> |
---|---|
date | Thu, 08 May 2014 16:50:22 -0700 |
parents | e43184680461 |
children |
line wrap: on
line source
.. Common link and substitution definitions. .. |hg(1)| replace:: **hg**\ (1) .. _hg(1): hg.1.html .. |hgrc(5)| replace:: **hgrc**\ (5) .. _hgrc(5): hgrc.5.html .. |hgignore(5)| replace:: **hgignore**\ (5) .. _hgignore(5): hgignore.5.html