Code

Merge branch 'lt/config' into next
authorJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 01:49:54 +0000 (18:49 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 14 May 2006 01:49:54 +0000 (18:49 -0700)
* 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


Trivial merge