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

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

tests: make merge conflicts explicit in `hg annotate` tests...
tests: make merge conflicts explicit in `hg annotate` tests We were using `true` as merge tool. I think it makes the test easier to understand if we make the conflicts explcit. It also papered over a conflict that shouldn't have been a conflict (just a bug in copy tracing). I've marked that "BROKEN". Differential Revision: https://phab.mercurial-scm.org/D6252
Yuya Nishihara - - Load All Authors

File last commit:

r38982:f9a98075 default
r42327:7116fc61 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'