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
Junio C Hamano committed
May 9, 2006 at 19:32 UTC
7278a29a277750e9e3cccce3cfb751d6171b1a43
No changes.