Three-way merge: fix silly bug that made trivial merges not work
[git.git] / mozilla-sha1 /
2005-04-21 Linus TorvaldsAdd support for alternate SHA1 library implementations.