Merge branch 'maint'

* maint:
  git-diff -B output fix.
  Fix git-am safety checks
  Fix duplicate xmalloc in builtin-add
This commit is contained in:
Junio C Hamano 2006-10-01 01:10:03 -07:00
commit 284fe4beb6

Diff Content Not Available