##// END OF EJS Templates
merge: move conversion of file-key dict to action-key dict in mergeresult...
merge: move conversion of file-key dict to action-key dict in mergeresult Initially the actions dict which we get has file has keys, but later we want a dict which has actions as keys. This patch moves code computing that to mergeresult class as that's where it should be anyway. Differential Revision: https://phab.mercurial-scm.org/D8817

File last commit:

r19429:c8490dcc default
r45836:f4a2b329 default
Show More
logentry.tmpl
6 lines | 172 B | application/x-cheetah | CheetahLexer
changeset: {node}
revision: {rev}
user: {author}
date: {date|rfc822date}
summary: {desc}
{branches%branchname}{tags%tagname}{bookmarks%bookmarkname}