Commit Graph

2 Commits

Author SHA1 Message Date
Tad Hardesty
b4c330c24c Fix hook installation on Linux
Marks the shell scripts executable and sets nullglob so that the lack of
merge drivers doesn't cause shenanigans.
2018-01-30 16:55:37 -08:00
Tad Hardesty
9639061433 Add a new and improved mapmerge (#33869)
Key benefits of the new mapmerge include: multi-Z support, effective
reuse of deleted keys, automatic handling of key overflow, and utilizing
a git pre-commit hook to eliminate the need to run batch files manually.
2017-12-28 16:01:34 -05:00