Merge branch 'master' into next
commit88ec4c9712bfbf35cd90144c0f118891ef349639
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 03:44:17 +0000 (14 20:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 03:44:17 +0000 (14 20:44 -0700)
treecd2ea8eb585c011650388b1be0beb6652b0f1b08
parentfcbf71a2ac7af454bec14832c8dfba57e793dda7
parent2f80de956f71880b000933b1b9bff4991c5b3ca9
Merge branch 'master' into next

* master:
  add, merge, diff: do not use strcasecmp to compare config variable names
builtin/add.c