From: Junio C Hamano <junkio@cox.net>
Date: Wed, 10 May 2006 02:32:08 +0000 (-0700)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.4.1-rc1~117
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7278a29a277750e9e3cccce3cfb751d6171b1a43;p=git.git

Merge branch 'master' into next

* master:
  checkout: use --aggressive when running a 3-way merge (-m).
  revert/cherry-pick: use aggressive merge.
  read-cache.c: use xcalloc() not calloc()
  apply: fix infinite loop with multiple patches with --index
---

7278a29a277750e9e3cccce3cfb751d6171b1a43