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

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

simplemerge: convert `merge_lines()` away from generator...
simplemerge: convert `merge_lines()` away from generator We always consume all the lines and put them in a list anyway. By making the function not a generator, we can later make it return an additional value (to indicate if there were conflicts). Differential Revision: https://phab.mercurial-scm.org/D11973
Yuya Nishihara - - Load All Authors

File last commit:

r38982:f9a98075 default
r49388:3f5bc446 default
Show More
map-cmdline.phases
5 lines | 263 B | text/plain | TextLexer
/ mercurial / templates / map-cmdline.phases
History | Annotation | Raw |Copy content |Copy permalink
%include map-cmdline.default
[templates]
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'