From: Junio C Hamano <junkio@cox.net>
Date: Sun, 1 Oct 2006 08:10:03 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.4.3-rc1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/284fe4beb6b4835ef6857cd56b34c70c1d12b14d

Merge branch 'maint'

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

284fe4beb6b4835ef6857cd56b34c70c1d12b14d