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

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

simplemerge: enable option to resolve conflicts one way...
simplemerge: enable option to resolve conflicts one way With this change, the simplemerge algorithm grows an option to only return the local or the other hunk in a conflicting region.
Dan Villiom Podlaski Christiansen - - Load All Authors

File last commit:

r9999:f91e5630 default
r26223:ed12abab default
Show More
manifest.tmpl
3 lines | 58 B | application/x-cheetah | CheetahLexer
/ mercurial / templates / raw / manifest.tmpl
History | Annotation | Raw |Copy content |Copy permalink
{header}
{dentries%direntry}{fentries%fileentry}
{footer}