##// 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.
Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default
r27025:ec372573 default
Show More
fileannotate.tmpl
5 lines | 44 B | application/x-cheetah | CheetahLexer
/ mercurial / templates / raw / fileannotate.tmpl
History | Annotation | Raw |Copy content |Copy permalink
{header}
{annotate%annotateline}
{footer}