Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Sun, 1 Oct 2006 08:10:03 +0000 (01:10 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 1 Oct 2006 08:10:03 +0000 (01:10 -0700)
* maint:
git-diff -B output fix.
Fix git-am safety checks
Fix duplicate xmalloc in builtin-add

Trivial merge