Code

Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 11 Mar 2011 06:45:49 +0000 (22:45 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 11 Mar 2011 06:45:49 +0000 (22:45 -0800)
* maint:
  Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"

1  2 
Documentation/config.txt
cache.h
config.c

Simple merge
diff --cc cache.h
Simple merge
diff --cc config.c
Simple merge