From: Junio C Hamano Date: Sun, 1 Oct 2006 08:10:03 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=284fe4beb6b4835ef6857cd56b34c70c1d12b14d;p=rit Merge branch 'maint' * maint: git-diff -B output fix. Fix git-am safety checks Fix duplicate xmalloc in builtin-add --- 284fe4beb6b4835ef6857cd56b34c70c1d12b14d