##// END OF EJS Templates
configitems: make all regular expressions bytes and not native str...
Augie Fackler -
r34892:6b77c13a default
parent child Browse files
Show More
@@ -584,52 +584,52 b" coreconfigitem('merge-tools', '.*',"
584 default=None,
584 default=None,
585 generic=True,
585 generic=True,
586 )
586 )
587 coreconfigitem('merge-tools', r'.*\.args$',
587 coreconfigitem('merge-tools', br'.*\.args$',
588 default="$local $base $other",
588 default="$local $base $other",
589 generic=True,
589 generic=True,
590 priority=-1,
590 priority=-1,
591 )
591 )
592 coreconfigitem('merge-tools', r'.*\.binary$',
592 coreconfigitem('merge-tools', br'.*\.binary$',
593 default=False,
593 default=False,
594 generic=True,
594 generic=True,
595 priority=-1,
595 priority=-1,
596 )
596 )
597 coreconfigitem('merge-tools', r'.*\.check$',
597 coreconfigitem('merge-tools', br'.*\.check$',
598 default=list,
598 default=list,
599 generic=True,
599 generic=True,
600 priority=-1,
600 priority=-1,
601 )
601 )
602 coreconfigitem('merge-tools', r'.*\.checkchanged$',
602 coreconfigitem('merge-tools', br'.*\.checkchanged$',
603 default=False,
603 default=False,
604 generic=True,
604 generic=True,
605 priority=-1,
605 priority=-1,
606 )
606 )
607 coreconfigitem('merge-tools', r'.*\.executable$',
607 coreconfigitem('merge-tools', br'.*\.executable$',
608 default=dynamicdefault,
608 default=dynamicdefault,
609 generic=True,
609 generic=True,
610 priority=-1,
610 priority=-1,
611 )
611 )
612 coreconfigitem('merge-tools', r'.*\.fixeol$',
612 coreconfigitem('merge-tools', br'.*\.fixeol$',
613 default=False,
613 default=False,
614 generic=True,
614 generic=True,
615 priority=-1,
615 priority=-1,
616 )
616 )
617 coreconfigitem('merge-tools', r'.*\.gui$',
617 coreconfigitem('merge-tools', br'.*\.gui$',
618 default=False,
618 default=False,
619 generic=True,
619 generic=True,
620 priority=-1,
620 priority=-1,
621 )
621 )
622 coreconfigitem('merge-tools', r'.*\.priority$',
622 coreconfigitem('merge-tools', br'.*\.priority$',
623 default=0,
623 default=0,
624 generic=True,
624 generic=True,
625 priority=-1,
625 priority=-1,
626 )
626 )
627 coreconfigitem('merge-tools', r'.*\.premerge$',
627 coreconfigitem('merge-tools', br'.*\.premerge$',
628 default=dynamicdefault,
628 default=dynamicdefault,
629 generic=True,
629 generic=True,
630 priority=-1,
630 priority=-1,
631 )
631 )
632 coreconfigitem('merge-tools', r'.*\.symlink$',
632 coreconfigitem('merge-tools', br'.*\.symlink$',
633 default=False,
633 default=False,
634 generic=True,
634 generic=True,
635 priority=-1,
635 priority=-1,
General Comments 0
You need to be logged in to leave comments. Login now