##// END OF EJS Templates
merge: don't pay for pathconflicts if there are none
merge: don't pay for pathconflicts if there are none

File last commit:

r9999:f91e5630 default
r50781:3aa8e569 default
Show More
filediff.tmpl
5 lines | 27 B | application/x-cheetah | CheetahLexer
{header}
{diff}
{footer}