##// END OF EJS Templates
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.

File last commit:

r9999:f91e5630 default
r26223:ed12abab default
Show More
notfound.tmpl
2 lines | 44 B | application/x-cheetah | CheetahLexer
Dan Villiom Podlaski Christiansen
setup: install translation files as package data...
r9999 {header}
error: repository {repo} not found