Make sure we error out if we can't remove a file on automatic merges.
[gitweb.git] / write-blob.c
2005-05-03 Automatic merge of /home/torvalds/junkio/.git/
2005-05-02 Add git-write-blob.