Code

Make sure we error out if we can't remove a file on automatic merges.
[git.git] / git
2005-06-01 Linus TorvaldsAdd "git" and "git-log-script" helper scripts.