Merge branch 'maint'
commit2f80de956f71880b000933b1b9bff4991c5b3ca9
authorJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 03:44:09 +0000 (14 20:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 15 May 2011 03:44:09 +0000 (14 20:44 -0700)
tree46baf64190b08c6c609915aa24e59578d87b1e0a
parent2de58b398b5a1f81bf74a385e41cfc2fcd9cb427
parent8c2be75fe117f5079087a6dfb07c573cc6716143
Merge branch 'maint'

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