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
Showing
- mercurial/filemerge.py 57 additions, 2 deletionsmercurial/filemerge.py
- mercurial/help/config.txt 14 additions, 0 deletionsmercurial/help/config.txt
- tests/test-commit-amend.t 17 additions, 17 deletionstests/test-commit-amend.t
- tests/test-conflict.t 44 additions, 4 deletionstests/test-conflict.t
- tests/test-keyword.t 2 additions, 2 deletionstests/test-keyword.t
- tests/test-merge-revert2.t 2 additions, 2 deletionstests/test-merge-revert2.t
- tests/test-merge-tools.t 2 additions, 2 deletionstests/test-merge-tools.t
- tests/test-merge-types.t 8 additions, 8 deletionstests/test-merge-types.t
- tests/test-merge7.t 2 additions, 2 deletionstests/test-merge7.t
- tests/test-shelve.t 6 additions, 6 deletionstests/test-shelve.t
- tests/test-subrepo.t 2 additions, 2 deletionstests/test-subrepo.t
Loading
Please register or sign in to comment