Three-way merge: fix silly bug that made trivial merges not work
[git] / git-log-script
2005-06-01  Linus TorvaldsAdd "git" and "git-log-script" helper scripts.