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

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

resolve: fix incorrect merge...
resolve: fix incorrect merge The merge from stable into default was semantically incomplete -- a couple of changes in preceding code had to be rewritten here. This code only triggers for change/delete conflicts, so we can't test it yet. We will soon be able to do it, though.
Paul Boddie - - Load All Authors

File last commit:

r16773:d490edc7 default
r27025:ec372573 default
Show More
graphedge.tmpl
1 line | 70 B | application/x-cheetah | CheetahLexer
/ mercurial / templates / raw / graphedge.tmpl
History | Annotation | Raw |Copy content |Copy permalink
edge: ({col}, {row}) -> ({nextcol}, {nextrow}) (color {color})