equal
deleted
inserted
replaced
1784 generic=True, |
1784 generic=True, |
1785 priority=-1, |
1785 priority=-1, |
1786 ) |
1786 ) |
1787 coreconfigitem( |
1787 coreconfigitem( |
1788 b'merge-tools', |
1788 b'merge-tools', |
|
1789 br'.*\.regappend$', |
|
1790 default=b"", |
|
1791 generic=True, |
|
1792 priority=-1, |
|
1793 ) |
|
1794 coreconfigitem( |
|
1795 b'merge-tools', |
1789 br'.*\.symlink$', |
1796 br'.*\.symlink$', |
1790 default=False, |
1797 default=False, |
1791 generic=True, |
1798 generic=True, |
1792 priority=-1, |
1799 priority=-1, |
1793 ) |
1800 ) |