##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: introduce hasconflicts() on mergeresult object...
merge: introduce hasconflicts() on mergeresult object This and upcoming patches will improve the mergeresult object making it more powerful and provide clean APIs for various things. Doing this will clean up the core merge code which is present in `update()` a bit. Differential Revision: https://phab.mercurial-scm.org/D8816
Yuya Nishihara - - Load All Authors

File last commit:

r38982:f9a98075 default
r45835:0c849f01 default
Show More
map-cmdline.phases
5 lines | 263 B | text/plain | TextLexer
/ mercurial / templates / map-cmdline.phases
History | Source | Raw |Copy content |Copy permalink
Yuya Nishihara
template-phases: extend default style instead of duplicating it...
 r24907 %include map-cmdline.default
Yuya Nishihara
templater: load template fragments from [templates] section in map file...
 r34715
[templates]
Yuya Nishihara
templates: rename "user" to "luser" defined in default map file (API)...
 r38982 changeset = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{luser}{ldate}{summary}\n'
changeset_verbose = '{cset}{branches}{bookmarks}{tags}{lphase}{parents}{luser}{ldate}{lfiles}{lfile_copies_switch}{description}\n'