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)
commit284fe4beb6b4835ef6857cd56b34c70c1d12b14d
treea1eedc952588f20afe95e8488e2f4664b13dc597
parent69de8cc8527dc45a7aef76e8f1ace45b509b3712
parent82ca50556471eadfc3212cb478161c3da5c4d02a
Merge branch 'maint'

* maint:
  git-diff -B output fix.
  Fix git-am safety checks
  Fix duplicate xmalloc in builtin-add