##// END OF EJS Templates
simplemerge: use same newline detection for :mergediff as for :merge[3]...
simplemerge: use same newline detection for :mergediff as for :merge[3] The `:merge` and `:merge3` markers used the newline style detected from the base input. The `:mergediff` style always used LF as newline character. This patch teaches `:mergediff` to use the same detection as the others did. Differential Revision: https://phab.mercurial-scm.org/D11976

File last commit:

r35095:23bba755 default
r49391:2c802d46 default
Show More
graphnode.tmpl
7 lines | 240 B | application/x-cheetah | CheetahLexer
changeset: {node|short}
user: {author|person}
date: {date|age}
summary: {desc|firstline|nonempty}
{branches%branchname}{tags%tagname}{bookmarks%bookmarkname}
node: ({col}, {row}) (color {color})
{edges%graphedge}