Make "read-tree" know how to do a "1-way merge".
[git.git] / git-prune-script
2005-04-18 Linus TorvaldsAdd the simple scripts I used to do a merge with conten...