Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 03:44:09 +0000 (20:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 03:44:09 +0000 (20:44 -0700)
* maint:
  add, merge, diff: do not use strcasecmp to compare config variable names

1  2 
builtin/add.c
merge-recursive.c

diff --cc builtin/add.c
Simple merge
Simple merge