Make sure we error out if we can't remove a file on automatic merges.
[git] / usage.c
2005-05-22  Linus TorvaldsInclude file cleanups..
2005-04-18  Linus TorvaldsSplit up read-cache.c into more logical clumps.