tree a1eedc952588f20afe95e8488e2f4664b13dc597
parent 69de8cc8527dc45a7aef76e8f1ace45b509b3712
parent 82ca50556471eadfc3212cb478161c3da5c4d02a
author Junio C Hamano <junkio@cox.net> 1159690203 -0700
committer Junio C Hamano <junkio@cox.net> 1159690203 -0700

Merge branch 'maint'

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