mercurial/templates/map-cmdline.phases
author Pulkit Goyal <pulkit@yandex-team.ru>
Sun, 26 Aug 2018 19:14:26 +0300
changeset 39285 a3fd84f4fb38
parent 38947 f9a98075a37e
permissions -rw-r--r--
filemerge: fix the wrong placements of messages in prompt Mistakenly, the local-changed-other-deleted-message was put in other-change-local-deleted and vice versa. This followups on D4336. Thanks to Yuya who spotted this. Differential Revision: https://phab.mercurial-scm.org/D4375
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
24907
9570587b6986 template-phases: extend default style instead of duplicating it
Yuya Nishihara <yuya@tcha.org>
parents: 24853
diff changeset
     1
%include map-cmdline.default
34714
f4aeb952ab77 templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents: 24907
diff changeset
     2
f4aeb952ab77 templater: load template fragments from [templates] section in map file
Yuya Nishihara <yuya@tcha.org>
parents: 24907
diff changeset
     3
[templates]
38947
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34714
diff changeset
     4
changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{luser}{ldate}{summary}\n'
f9a98075a37e templates: rename "user" to "luser" defined in default map file (API)
Yuya Nishihara <yuya@tcha.org>
parents: 34714
diff changeset
     5
changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{luser}{ldate}{lfiles}{lfile_copies_switch}{description}\n'