Three-way merge: fix silly bug that made trivial merges not work
[git.git] / COPYING
2005-04-11 Linus TorvaldsAdd a COPYING notice, making it explicit that the licen...