From: Junio C Hamano <junkio@cox.net>
Date: Sun, 14 May 2006 01:49:54 +0000 (-0700)
Subject: Merge branch 'lt/config' into next
X-Git-Tag: v1.4.1-rc1~116
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ea892b27b15fbc46a3bb3ad2ddce737dc6590ae5;p=git.git

Merge branch 'lt/config' into next

* lt/config:
  git config syntax updates
  Another config file parsing fix.
  checkout: use --aggressive when running a 3-way merge (-m).
  Fix git-pack-objects for 64-bit platforms
  fix diff-delta bad memory access
---

ea892b27b15fbc46a3bb3ad2ddce737dc6590ae5