Three-way merge: fix silly bug that made trivial merges not work
[git] / write-blob.c
2005-05-03  Linus TorvaldsAutomatic merge of /home/torvalds/junkio/.git/
2005-05-02  Junio C HamanoAdd git-write-blob.