equal
deleted
inserted
replaced
482 default=None, |
482 default=None, |
483 ) |
483 ) |
484 coreconfigitem('ui', 'mergemarkers', |
484 coreconfigitem('ui', 'mergemarkers', |
485 default='basic', |
485 default='basic', |
486 ) |
486 ) |
|
487 coreconfigitem('ui', 'mergemarkertemplate', |
|
488 default=('{node|short} ' |
|
489 '{ifeq(tags, "tip", "", ' |
|
490 'ifeq(tags, "", "", "{tags} "))}' |
|
491 '{if(bookmarks, "{bookmarks} ")}' |
|
492 '{ifeq(branch, "default", "", "{branch} ")}' |
|
493 '- {author|user}: {desc|firstline}') |
|
494 ) |
487 coreconfigitem('ui', 'nontty', |
495 coreconfigitem('ui', 'nontty', |
488 default=False, |
496 default=False, |
489 ) |
497 ) |
490 coreconfigitem('ui', 'origbackuppath', |
498 coreconfigitem('ui', 'origbackuppath', |
491 default=None, |
499 default=None, |