Make "read-tree" know how to do a "1-way merge".
[git.git] / COPYING
2005-04-11 Linus TorvaldsAdd a COPYING notice, making it explicit that the licen...